diff --git a/package-lock.json b/package-lock.json index 11d3303..14d9960 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30401,8 +30401,7 @@ "dependencies": { "@ldo/dataset": "^1.0.0-alpha.20", "@ldo/ldo": "^1.0.0-alpha.20", - "@ldo/rdf-utils": "^1.0.0-alpha.19", - "@rdfjs/data-model": "^1.2.0" + "@ldo/rdf-utils": "^1.0.0-alpha.19" }, "devDependencies": { "@ldo/connected-solid": "^1.0.0-alpha.20", diff --git a/packages/connected-nextgraph/package.json b/packages/connected-nextgraph/package.json index f3a47e0..8251207 100644 --- a/packages/connected-nextgraph/package.json +++ b/packages/connected-nextgraph/package.json @@ -39,7 +39,6 @@ "devDependencies": { "@inrupt/solid-client-authn-core": "^2.2.6", "@ldo/cli": "^1.0.0-alpha.20", - "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid-notifications/types": "^0.1.2", "@solid/community-server": "^7.1.3", @@ -71,4 +70,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/connected-nextgraph/src/resources/NextGraphResource.ts b/packages/connected-nextgraph/src/resources/NextGraphResource.ts index c90ff8c..a6304ea 100644 --- a/packages/connected-nextgraph/src/resources/NextGraphResource.ts +++ b/packages/connected-nextgraph/src/resources/NextGraphResource.ts @@ -16,15 +16,12 @@ import type { NextGraphConnectedPlugin } from "../NextGraphConnectedPlugin.js"; import { changesToSparqlUpdate, type DatasetChanges } from "@ldo/rdf-utils"; import type { NextGraphNotificationMessage } from "../notifications/NextGraphNotificationMessage.js"; import type { Dataset, Quad } from "@rdfjs/types"; -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode, quad as createQuad } from "@ldo/rdf-utils"; import { NextGraphReadSuccess } from "../results/NextGraphReadSuccess.js"; import { NextGraphNotificationSubscription } from "../notifications/NextGraphNotificationSubscription.js"; import { parseRdf } from "@ldo/ldo"; import type { LdoDataset } from "@ldo/ldo"; import { createDataset } from "@ldo/dataset"; - -const { namedNode, quad: createQuad } = rdfdm; - export class NextGraphResource extends (EventEmitter as new () => ResourceEventEmitter) implements Resource diff --git a/packages/connected-nextgraph/test/integration.test.ts b/packages/connected-nextgraph/test/integration.test.ts index 441ee76..f99a769 100644 --- a/packages/connected-nextgraph/test/integration.test.ts +++ b/packages/connected-nextgraph/test/integration.test.ts @@ -7,14 +7,12 @@ import type { } from "../src/index.js"; import { createNextGraphLdoDataset } from "../src/createNextGraphLdoDataset.js"; import { parseRdf } from "@ldo/ldo"; -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import type { NextGraphReadSuccess } from "../src/results/NextGraphReadSuccess.js"; import { rm, cp } from "fs/promises"; import path from "path"; import { describe, it, expect, beforeEach, afterAll } from "vitest"; -const { namedNode } = rdfdm; - const SAMPLE_TTL = `@base . @prefix rdf: . @prefix rdfs: . diff --git a/packages/connected-solid/package.json b/packages/connected-solid/package.json index b2b5e37..441d186 100644 --- a/packages/connected-solid/package.json +++ b/packages/connected-solid/package.json @@ -38,7 +38,6 @@ "@inrupt/solid-client-authn-core": "^2.2.6", "@ldo/cli": "^1.0.0-alpha.20", "@ldo/test-solid-server": "^1.0.0-alpha.14", - "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@solid-notifications/types": "^0.1.2", "@solid/community-server": "^7.1.3", @@ -65,4 +64,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/connected-solid/src/requester/requests/deleteResource.ts b/packages/connected-solid/src/requester/requests/deleteResource.ts index 173c414..ff94716 100644 --- a/packages/connected-solid/src/requester/requests/deleteResource.ts +++ b/packages/connected-solid/src/requester/requests/deleteResource.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import { guaranteeFetch } from "../../util/guaranteeFetch.js"; import { deleteResourceRdfFromContainer } from "../../util/rdfUtils.js"; import type { Resource } from "@ldo/connected"; @@ -13,8 +13,6 @@ import type { Quad } from "@rdfjs/types"; import type { SolidContainer } from "../../resources/SolidContainer.js"; import type { SolidLeaf } from "../../resources/SolidLeaf.js"; -const { namedNode } = rdfdm; - /** * All possible return values for deleteResource */ diff --git a/packages/connected-solid/src/requester/requests/readResource.ts b/packages/connected-solid/src/requester/requests/readResource.ts index a3f533d..8087d6b 100644 --- a/packages/connected-solid/src/requester/requests/readResource.ts +++ b/packages/connected-solid/src/requester/requests/readResource.ts @@ -14,7 +14,7 @@ import { guaranteeFetch } from "../../util/guaranteeFetch.js"; import type { Resource } from "@ldo/connected"; import { UnexpectedResourceError, AbsentReadSuccess } from "@ldo/connected"; import { checkHeadersForRootContainer } from "./checkRootContainer.js"; -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import type { SolidLeaf } from "../../resources/SolidLeaf.js"; import type { SolidContainer } from "../../resources/SolidContainer.js"; import { @@ -22,8 +22,6 @@ import { addResourceRdfToContainer, } from "../../util/rdfUtils.js"; -const { namedNode } = rdfdm; - /** * All possible return values for reading a leaf */ diff --git a/packages/connected-solid/src/resources/SolidContainer.ts b/packages/connected-solid/src/resources/SolidContainer.ts index 47b3767..a7aec7e 100644 --- a/packages/connected-solid/src/resources/SolidContainer.ts +++ b/packages/connected-solid/src/resources/SolidContainer.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import { ContainerBatchedRequester } from "../requester/ContainerBatchedRequester.js"; import type { CheckRootResult, @@ -41,8 +41,6 @@ import type { SolidLeaf } from "./SolidLeaf.js"; import type { HttpErrorResultType } from "../requester/results/error/HttpErrorResult.js"; import type { DatasetChanges } from "@ldo/rdf-utils"; -const { namedNode } = rdfdm; - /** * Represents the current status of a specific container on a Pod as known by * LDO. diff --git a/packages/connected-solid/src/util/rdfUtils.ts b/packages/connected-solid/src/util/rdfUtils.ts index 5767065..8d0f107 100644 --- a/packages/connected-solid/src/util/rdfUtils.ts +++ b/packages/connected-solid/src/util/rdfUtils.ts @@ -1,12 +1,10 @@ import type { LdoDataset } from "@ldo/ldo"; import { parseRdf } from "@ldo/ldo"; -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode, quad as createQuad } from "@ldo/rdf-utils"; import type { Dataset } from "@rdfjs/types"; import type { SolidContainerUri } from "../types.js"; import { isSolidContainerUri } from "./isSolidUri.js"; -const { namedNode, quad: createQuad } = rdfdm; - export const ldpContains = namedNode("http://www.w3.org/ns/ldp#contains"); export const rdfType = namedNode( "http://www.w3.org/1999/02/22-rdf-syntax-ns#type", diff --git a/packages/connected-solid/test/Integration.test.ts b/packages/connected-solid/test/Integration.test.ts index d209e09..aa1601d 100644 --- a/packages/connected-solid/test/Integration.test.ts +++ b/packages/connected-solid/test/Integration.test.ts @@ -3,7 +3,7 @@ import { quad as createQuad, literal, defaultGraph, -} from "@rdfjs/data-model"; +} from "@ldo/rdf-utils"; import type { CreateSuccess } from "../src/requester/results/success/CreateSuccess.js"; import { Buffer } from "buffer"; import { PostShShapeType } from "./.ldo/post.shapeTypes.js"; diff --git a/packages/connected-solid/test/LeafRequester.test.ts b/packages/connected-solid/test/LeafRequester.test.ts index 3665988..091ca64 100644 --- a/packages/connected-solid/test/LeafRequester.test.ts +++ b/packages/connected-solid/test/LeafRequester.test.ts @@ -3,7 +3,6 @@ // import type { SolidLdoDataset } from "../src/SolidLdoDataset.js"; // import { createSolidLdoDataset } from "../src/createSolidLdoDataset.js"; // import { LeafRequester } from "../src/requester/LeafRequester.js"; -// import * as rdfdm from '@rdfjs/data-model'; import { describe, it, expect } from "vitest"; describe("Leaf Requester", () => { diff --git a/packages/connected/package.json b/packages/connected/package.json index 66230e8..4d599dc 100644 --- a/packages/connected/package.json +++ b/packages/connected/package.json @@ -51,8 +51,7 @@ "dependencies": { "@ldo/dataset": "^1.0.0-alpha.20", "@ldo/ldo": "^1.0.0-alpha.20", - "@ldo/rdf-utils": "^1.0.0-alpha.19", - "@rdfjs/data-model": "^1.2.0" + "@ldo/rdf-utils": "^1.0.0-alpha.19" }, "files": [ "dist", @@ -62,4 +61,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/connected/src/trackingProxy/TrackingSubjectProxy.ts b/packages/connected/src/trackingProxy/TrackingSubjectProxy.ts index 0d05c72..4ee9093 100644 --- a/packages/connected/src/trackingProxy/TrackingSubjectProxy.ts +++ b/packages/connected/src/trackingProxy/TrackingSubjectProxy.ts @@ -5,9 +5,7 @@ import { } from "@ldo/jsonld-dataset-proxy"; import type { BlankNode, NamedNode } from "@rdfjs/types"; import type { TrackingProxyContext } from "./TrackingProxyContext.js"; -import * as rdfdm from "@rdfjs/data-model"; - -const { namedNode } = rdfdm; +import { namedNode } from "@ldo/rdf-utils"; /** * @internal diff --git a/packages/connected/src/trackingProxy/createTrackingProxy.ts b/packages/connected/src/trackingProxy/createTrackingProxy.ts index 04d0e8b..16add22 100644 --- a/packages/connected/src/trackingProxy/createTrackingProxy.ts +++ b/packages/connected/src/trackingProxy/createTrackingProxy.ts @@ -5,12 +5,10 @@ import { import { LdoBuilder } from "@ldo/ldo"; import type { LdoBase, LdoDataset, ShapeType } from "@ldo/ldo"; import { TrackingProxyContext } from "./TrackingProxyContext.js"; -import * as rdfdm from "@rdfjs/data-model"; +import { defaultGraph } from "@ldo/rdf-utils"; import type { nodeEventListener } from "@ldo/subscribable-dataset"; import type { Quad } from "@rdfjs/types"; -const { defaultGraph } = rdfdm; - /** * @internal * Creates a Linked Data Object builder that when creating linked data objects diff --git a/packages/connected/src/util/splitChangesByGraph.ts b/packages/connected/src/util/splitChangesByGraph.ts index 78bb04e..e5976ef 100644 --- a/packages/connected/src/util/splitChangesByGraph.ts +++ b/packages/connected/src/util/splitChangesByGraph.ts @@ -1,9 +1,7 @@ import { createDataset } from "@ldo/dataset"; import type { GraphNode, DatasetChanges } from "@ldo/rdf-utils"; import type { Quad } from "@rdfjs/types"; -import * as rdfdm from "@rdfjs/data-model"; - -const { defaultGraph, namedNode, quad: createQuad } = rdfdm; +import { defaultGraph, namedNode, quad as createQuad } from "@ldo/rdf-utils"; /** * @internal diff --git a/packages/dataset/Readme.md b/packages/dataset/Readme.md index 6c99143..be0271a 100644 --- a/packages/dataset/Readme.md +++ b/packages/dataset/Readme.md @@ -12,8 +12,7 @@ npm i @ldo/dataset ```typescript import { createDataset } from "@ldo/dataset"; -import * as rdfdm from '@rdfjs/data-model'; -const { quad, namedNode } = rdfdm; +import { quad, namedNode } from "@ldo/rdf-utils"; imports: quad, namedNode as MyNamedNode const dataset = createDataset(); @@ -38,13 +37,12 @@ The extended dataset implements all the [additional methods](https://rdf.js.org/ Usage: ```typescript import { createDataset } from "@ldo/dataset"; -import * as rdfdm from '@rdfjs/data-model'; +import { quad, namedNode, literal } as rdfdm from '@ldo/rdf-utils'; // Required for advanced features: import * as rdfds from "@rdfjs/dataset"; import { ExtendedDatasetFactory } from "@ldo/dataset"; import { Dataset, Quad, DatasetCoreFactory, DatasetCore } from "@rdfjs/types"; -const { quad, namedNode, literal } = rdfdm; const { dataset: initializeDatasetCore } = rdfds; /** diff --git a/packages/dataset/example/extendedDatasetExample.ts b/packages/dataset/example/extendedDatasetExample.ts index 62e6e64..c962d0a 100644 --- a/packages/dataset/example/extendedDatasetExample.ts +++ b/packages/dataset/example/extendedDatasetExample.ts @@ -2,7 +2,7 @@ import { createDataset } from "../src/index.js"; // Required for advanced features: import * as rdfds from "@rdfjs/dataset"; import { ExtendedDatasetFactory } from "../src/index.js"; -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode, quad, literal } from "@ldo/rdf-utils"; import type { Dataset, Quad, @@ -10,8 +10,9 @@ import type { DatasetCore, } from "@rdfjs/types"; -const { namedNode, quad, literal } = rdfdm; -const { dataset: initializeDatasetCore } = rdfds; +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore +const { dataset: initializeDatasetCore } = rdfds.default || rdfds; /** * Create a dataset with default settings diff --git a/packages/dataset/package.json b/packages/dataset/package.json index a685beb..8bf3db6 100644 --- a/packages/dataset/package.json +++ b/packages/dataset/package.json @@ -35,7 +35,6 @@ }, "homepage": "https://github.com/o-development/ldo/tree/main/packages/dataset#readme", "devDependencies": { - "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "@types/jsonld": "^1.5.6", "@types/rdfjs__dataset": "^1.0.4", @@ -57,4 +56,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/dataset/src/createExtendedDataset.ts b/packages/dataset/src/createExtendedDataset.ts index 82d77a6..b29ccd1 100644 --- a/packages/dataset/src/createExtendedDataset.ts +++ b/packages/dataset/src/createExtendedDataset.ts @@ -8,7 +8,10 @@ import ExtendedDatasetFactory from "./ExtendedDatasetFactory.js"; import * as rdfds from "@rdfjs/dataset"; import type ExtendedDataset from "./ExtendedDataset.js"; -const { dataset: initializeDatasetCore } = rdfds; +const initializeDatasetCore: (typeof rdfds)["dataset"] = + // eslint-disable-next-line @typescript-eslint/ban-ts-comment + // @ts-ignore + rdfds.default?.dataset || rdfds.dataset; /** * Creates a dataset factory that generates ExtendedDatasets diff --git a/packages/dataset/test/createExtendedDataset.test.ts b/packages/dataset/test/createExtendedDataset.test.ts index 39fb69f..fe0fbf3 100644 --- a/packages/dataset/test/createExtendedDataset.test.ts +++ b/packages/dataset/test/createExtendedDataset.test.ts @@ -1,7 +1,5 @@ import { createDataset } from "../src/index.js"; -import * as rdfdm from "@rdfjs/data-model"; - -const { quad, namedNode } = rdfdm; +import { quad, namedNode } from "@ldo/rdf-utils"; 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 bbfbb41..64b1ab6 100644 --- a/packages/dataset/test/dataset.testHelper.ts +++ b/packages/dataset/test/dataset.testHelper.ts @@ -1,10 +1,8 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { quad, namedNode, literal } from "@ldo/rdf-utils"; import type { BaseQuad, Dataset, DatasetFactory, Quad } from "@rdfjs/types"; import type { SubjectNode, ObjectNode, PredicateNode } from "@ldo/rdf-utils"; import { Readable } from "stream"; -const { quad, namedNode, literal } = rdfdm; - export default function testDataset( datasetFactory: DatasetFactory, ): void { diff --git a/packages/jsonld-dataset-proxy/README.md b/packages/jsonld-dataset-proxy/README.md index 03bd64a..a57f726 100644 --- a/packages/jsonld-dataset-proxy/README.md +++ b/packages/jsonld-dataset-proxy/README.md @@ -50,8 +50,7 @@ npm install @ldo/jsonld-dataset-proxy import jsonldDatasetProxy, { write, LdSet } from "jsonld-dataset-proxy"; import { ContextDefinition } from "jsonld"; import { serializedToDataset } from "@ldo/dataset"; -import * as rdfdm from '@rdfjs/data-model'; -const { namedNode } = rdfdm; +import { namedNode } from "@ldo/rdf-utils"; async function start() { // Define initial data diff --git a/packages/jsonld-dataset-proxy/package.json b/packages/jsonld-dataset-proxy/package.json index d709404..0347f85 100644 --- a/packages/jsonld-dataset-proxy/package.json +++ b/packages/jsonld-dataset-proxy/package.json @@ -51,12 +51,10 @@ "dependencies": { "@ldo/rdf-utils": "^1.0.0-alpha.19", "@ldo/subscribable-dataset": "^1.0.0-alpha.20", - "@rdfjs/data-model": "^1.2.0", - "@rdfjs/dataset": "^1.1.0", "jsonld2graphobject": "^0.0.4" }, "publishConfig": { "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts b/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts index 7d4e615..1fc815c 100644 --- a/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts +++ b/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode, blankNode } from "@ldo/rdf-utils"; import type { BlankNode, NamedNode } from "@rdfjs/types"; import type { GraphNode, QuadMatch } from "@ldo/rdf-utils"; import type { LanguageOrdering } from "./language/languageTypes.js"; @@ -6,8 +6,6 @@ import type { ProxyContext } from "./ProxyContext.js"; import type { LiteralLike, ObjectLike } from "./types.js"; import type { LdSet } from "./setProxy/ldSet/LdSet.js"; -const { namedNode, blankNode } = rdfdm; - /** * Helps build JSON LD Dataset Proxies for a specific dataset and context */ diff --git a/packages/jsonld-dataset-proxy/src/ProxyContext.ts b/packages/jsonld-dataset-proxy/src/ProxyContext.ts index f57dfcb..a1031a2 100644 --- a/packages/jsonld-dataset-proxy/src/ProxyContext.ts +++ b/packages/jsonld-dataset-proxy/src/ProxyContext.ts @@ -5,12 +5,10 @@ import type { SubjectProxy } from "./subjectProxy/SubjectProxy.js"; import type { SetProxy } from "./setProxy/SetProxy.js"; import type { ContextUtil } from "./ContextUtil.js"; import type { LanguageOrdering } from "./language/languageTypes.js"; -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import type { RawValue } from "./util/RawObject.js"; import { createNewSetProxy } from "./setProxy/createNewSetProxy.js"; -const { namedNode } = rdfdm; - export interface ProxyContextOptions { dataset: Dataset; contextUtil: ContextUtil; diff --git a/packages/jsonld-dataset-proxy/src/graphOf.ts b/packages/jsonld-dataset-proxy/src/graphOf.ts index b6d1ee8..9e654f0 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 * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import { getSubjectProxyFromObject } from "./subjectProxy/isSubjectProxy.js"; import type { ObjectLike } from "./types.js"; import { @@ -11,8 +11,6 @@ import { import type { LdSet } from "./setProxy/ldSet/LdSet.js"; import { getNodeFromRawValue } from "./util/getNodeFromRaw.js"; -const { namedNode } = rdfdm; - /** * Returns the graph for which a defined triple is a member * @param subject A JsonldDatasetProxy that represents the subject diff --git a/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts b/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts index ff3b9cc..2308419 100644 --- a/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts +++ b/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { defaultGraph } from "@ldo/rdf-utils"; import type { Dataset } from "@rdfjs/types"; import type { ContextDefinition } from "jsonld"; import { ContextUtil } from "./ContextUtil.js"; @@ -6,8 +6,6 @@ import { JsonldDatasetProxyBuilder } from "./JsonldDatasetProxyBuilder.js"; import { ProxyContext } from "./ProxyContext.js"; import type { LdoJsonldContext } from "./LdoJsonldContext.js"; -const { defaultGraph } = rdfdm; - /** * Creates a JSON-LD Dataset Proxy * diff --git a/packages/jsonld-dataset-proxy/src/language/languageMapProxy.ts b/packages/jsonld-dataset-proxy/src/language/languageMapProxy.ts index 06e94ba..5483e20 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 * as rdfdm from "@rdfjs/data-model"; +import { quad, literal } from "@ldo/rdf-utils"; import type { ProxyContext } from "../ProxyContext.js"; import { languageKeyToLiteralLanguage, @@ -9,8 +9,6 @@ import { import type { LanguageMap, LanguageSetMap } from "./languagesOf.js"; import LanguageSet from "./languageSet.js"; -const { quad, literal } = rdfdm; - export function createLanguageMapProxy< Target extends LanguageMap | LanguageSetMap, >( diff --git a/packages/jsonld-dataset-proxy/src/language/languageSet.ts b/packages/jsonld-dataset-proxy/src/language/languageSet.ts index 85bbf1a..7ede47f 100644 --- a/packages/jsonld-dataset-proxy/src/language/languageSet.ts +++ b/packages/jsonld-dataset-proxy/src/language/languageSet.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { literal, quad } from "@ldo/rdf-utils"; import type { PredicateNode, SubjectNode } from "@ldo/rdf-utils"; import type { Dataset, Literal } from "@rdfjs/types"; import type { LanguageKey } from "./languageTypes.js"; @@ -6,8 +6,6 @@ import type { LiteralObjectQuad } from "./languageUtils.js"; import { languageDeleteMatch, languageMatch } from "./languageUtils.js"; import type { ProxyContext } from "../ProxyContext.js"; -const { literal, quad } = rdfdm; - export default class LanguageSet implements Set { private subject: SubjectNode; private predicate: PredicateNode; diff --git a/packages/jsonld-dataset-proxy/src/language/languagesOf.ts b/packages/jsonld-dataset-proxy/src/language/languagesOf.ts index 42c5252..3bfb537 100644 --- a/packages/jsonld-dataset-proxy/src/language/languagesOf.ts +++ b/packages/jsonld-dataset-proxy/src/language/languagesOf.ts @@ -1,12 +1,10 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import { getSubjectProxyFromObject } from "../subjectProxy/isSubjectProxy.js"; import type { ObjectLike } from "../types.js"; import { _getUnderlyingNode, _proxyContext } from "../types.js"; import { createLanguageMapProxy } from "./languageMapProxy.js"; import type { LdSet } from "../setProxy/ldSet/LdSet.js"; -const { namedNode } = rdfdm; - /** * ----------------------------------------------------------------------------- * Types diff --git a/packages/jsonld-dataset-proxy/src/setProxy/SubjectSetProxy.ts b/packages/jsonld-dataset-proxy/src/setProxy/SubjectSetProxy.ts index 1b5743c..8bc0b99 100644 --- a/packages/jsonld-dataset-proxy/src/setProxy/SubjectSetProxy.ts +++ b/packages/jsonld-dataset-proxy/src/setProxy/SubjectSetProxy.ts @@ -8,7 +8,7 @@ import { addObjectToDataset } from "../util/addObjectToDataset.js"; import type { ProxyContext } from "../ProxyContext.js"; import { WildcardSubjectSetProxy } from "./WildcardSubjectSetProxy.js"; import { _getUnderlyingNode } from "../types.js"; -import * as rdfdm from "@rdfjs/data-model"; +import { quad, defaultGraph } from "@ldo/rdf-utils"; import { createTransactionDatasetFactory, TransactionDataset, @@ -17,8 +17,6 @@ import { createDatasetFactory } from "@ldo/dataset"; import { getNodeFromRawObject } from "../util/getNodeFromRaw.js"; import { nodeToString } from "../util/NodeSet.js"; -const { quad, defaultGraph } = rdfdm; - export type SubjectSetProxyQuadMatch = [ undefined | null, PredicateNode, diff --git a/packages/jsonld-dataset-proxy/src/setProxy/ldSet/BasicLdSet.ts b/packages/jsonld-dataset-proxy/src/setProxy/ldSet/BasicLdSet.ts index d8e608c..bd4ece3 100644 --- a/packages/jsonld-dataset-proxy/src/setProxy/ldSet/BasicLdSet.ts +++ b/packages/jsonld-dataset-proxy/src/setProxy/ldSet/BasicLdSet.ts @@ -2,9 +2,7 @@ import type { BlankNode, NamedNode } from "@rdfjs/types"; import { _getUnderlyingNode } from "../../types.js"; import type { RawValue } from "../../util/RawObject.js"; import type { LdSet } from "./LdSet.js"; -import * as rdfdm from "@rdfjs/data-model"; - -const { blankNode } = rdfdm; +import { blankNode } from "@ldo/rdf-utils"; /* eslint-disable @typescript-eslint/no-explicit-any */ export class BasicLdSet = NonNullable> diff --git a/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts b/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts index 2bbbbf8..ede4a7e 100644 --- a/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts +++ b/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode, blankNode, quad } from "@ldo/rdf-utils"; import type { BlankNode, NamedNode } from "@rdfjs/types"; import { addObjectToDataset } from "../util/addObjectToDataset.js"; import { deleteValueFromDataset } from "./deleteFromDataset.js"; @@ -10,8 +10,6 @@ import { } from "../types.js"; import { getValueForKey } from "./getValueForKey.js"; import type { ProxyContext } from "../ProxyContext.js"; - -const { namedNode, blankNode, quad } = rdfdm; export interface SubjectProxyTarget { "@id": NamedNode | BlankNode; } diff --git a/packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts b/packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts index 525e0ad..2041e9c 100644 --- a/packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts +++ b/packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts @@ -1,13 +1,11 @@ import type { SubjectProxyTarget } from "./createSubjectHandler.js"; -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import { nodeToJsonldRepresentation } from "../util/nodeToJsonldRepresentation.js"; import type { SubjectProxy } from "./SubjectProxy.js"; import type { SetProxy } from "../setProxy/SetProxy.js"; import type { ProxyContext } from "../ProxyContext.js"; import { filterQuadsByLanguageOrdering } from "../language/languageUtils.js"; -const { namedNode } = rdfdm; - /** * Given a subject target and a key return the correct value */ diff --git a/packages/jsonld-dataset-proxy/src/util/addObjectToDataset.ts b/packages/jsonld-dataset-proxy/src/util/addObjectToDataset.ts index 4d017b6..8f1042c 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 "@rdfjs/types"; -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode, literal, quad } from "@ldo/rdf-utils"; import { _getUnderlyingNode } from "../types.js"; import type { SubjectProxy } from "../subjectProxy/SubjectProxy.js"; import { getNodeFromRawObject, getNodeFromRawValue } from "./getNodeFromRaw.js"; @@ -14,8 +14,6 @@ import { } from "../language/languageUtils.js"; import { BasicLdSet } from "../setProxy/ldSet/BasicLdSet.js"; -const { namedNode, literal, quad } = rdfdm; - export function addRawValueToDatasetRecursive( subject: NamedNode | BlankNode, key: string, diff --git a/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts b/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts index 473bf43..ebf2e5b 100644 --- a/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts +++ b/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts @@ -1,12 +1,10 @@ import type { BlankNode, Literal, NamedNode } from "@rdfjs/types"; -import * as rdfdm from "@rdfjs/data-model"; +import { blankNode, namedNode, literal } from "@ldo/rdf-utils"; import type { ContextUtil } from "../ContextUtil.js"; import { _getUnderlyingNode } from "../types.js"; import type { RawObject, RawValue } from "./RawObject.js"; import type { ProxyContext } from "../ProxyContext.js"; -const { blankNode, namedNode, literal } = rdfdm; - export function getNodeFromRawObject( item: RawObject, contextUtil: ContextUtil, diff --git a/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts b/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts index 53bd327..1a3f7fa 100644 --- a/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts +++ b/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts @@ -1,12 +1,10 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import jsonldDatasetProxy, { BasicLdSet, _getUnderlyingNode, } from "../src/index.js"; import { createDataset } from "@ldo/dataset"; -const { namedNode } = rdfdm; - describe("BasicLdSet", () => { describe("constructor and add", () => { test("should add primitive values correctly", () => { diff --git a/packages/jsonld-dataset-proxy/test/ContextUtil.test.ts b/packages/jsonld-dataset-proxy/test/ContextUtil.test.ts index 3561be8..0f75801 100644 --- a/packages/jsonld-dataset-proxy/test/ContextUtil.test.ts +++ b/packages/jsonld-dataset-proxy/test/ContextUtil.test.ts @@ -1,9 +1,7 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import { ContextUtil } from "../src/ContextUtil.js"; import { scopedContext } from "./scopedExampleData.js"; -const { namedNode } = rdfdm; - describe("ContextUtil", () => { describe("keyToIri and iriToKey", () => { it("handles a context that is simply a string map", () => { diff --git a/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts b/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts index 60de3da..8fbdbd9 100644 --- a/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts +++ b/packages/jsonld-dataset-proxy/test/jsonldDatasetProxy.test.ts @@ -1,5 +1,9 @@ import { createDataset, serializedToDataset } from "@ldo/dataset"; -import type { JsonldDatasetProxyBuilder, LanguageSet, LdSet } from "../src/index.js"; +import type { + JsonldDatasetProxyBuilder, + LanguageSet, + LdSet, +} from "../src/index.js"; import { graphOf, jsonldDatasetProxy, @@ -32,7 +36,7 @@ import { literal, defaultGraph, blankNode, -} from "@rdfjs/data-model"; +} from "@ldo/rdf-utils"; import type { Dataset, NamedNode } from "@rdfjs/types"; import type { ContextDefinition } from "jsonld"; import type { LdoJsonldContext } from "../src/LdoJsonldContext.js"; diff --git a/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts b/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts index 487ae68..7706a7b 100644 --- a/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts +++ b/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts @@ -1,11 +1,9 @@ import { createDataset } from "@ldo/dataset"; import { ContextUtil } from "../src/ContextUtil.js"; import { nodeToJsonldRepresentation } from "../src/util/nodeToJsonldRepresentation.js"; -import * as rdfdm from "@rdfjs/data-model"; +import { defaultGraph, literal } from "@ldo/rdf-utils"; import { ProxyContext } from "../src/index.js"; -const { defaultGraph, literal } = rdfdm; - describe("objectToJsonRepresentation", () => { const extraParams: ProxyContext = new ProxyContext({ dataset: createDataset(), diff --git a/packages/jsonld-dataset-proxy/test/nodeToString.test.ts b/packages/jsonld-dataset-proxy/test/nodeToString.test.ts index 31dcf52..ad1942e 100644 --- a/packages/jsonld-dataset-proxy/test/nodeToString.test.ts +++ b/packages/jsonld-dataset-proxy/test/nodeToString.test.ts @@ -1,8 +1,6 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode, blankNode, literal, defaultGraph } from "@ldo/rdf-utils"; import { nodeToString } from "../src/index.js"; -const { namedNode, blankNode, literal, defaultGraph } = rdfdm; - describe("nodeToString", () => { it("returns all the correct values for nodeToString", () => { expect(nodeToString(namedNode("http://example.com"))).toBe( diff --git a/packages/ldo/package.json b/packages/ldo/package.json index c00671a..5c14167 100644 --- a/packages/ldo/package.json +++ b/packages/ldo/package.json @@ -49,7 +49,6 @@ "@ldo/dataset": "^1.0.0-alpha.20", "@ldo/jsonld-dataset-proxy": "^1.0.0-alpha.20", "@ldo/subscribable-dataset": "^1.0.0-alpha.20", - "@rdfjs/data-model": "^1.2.0", "buffer": "^6.0.3", "readable-stream": "^4.3.0" }, @@ -64,4 +63,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/ldo/src/parseRdf.ts b/packages/ldo/src/parseRdf.ts index 89011d9..891a5b1 100644 --- a/packages/ldo/src/parseRdf.ts +++ b/packages/ldo/src/parseRdf.ts @@ -2,7 +2,10 @@ import type { Dataset } from "@rdfjs/types"; import type { JsonLdDocument } from "jsonld"; import type { ParserOptions } from "n3"; import { createDatasetFromSerializedInput } from "@ldo/dataset"; -import { createLdoDataset, createLdoDatasetFactory } from "./createLdoDataset.js"; +import { + createLdoDataset, + createLdoDatasetFactory, +} from "./createLdoDataset.js"; import type { LdoDataset } from "./LdoDataset.js"; /** diff --git a/packages/ldo/src/util.ts b/packages/ldo/src/util.ts index cea7a29..e426529 100644 --- a/packages/ldo/src/util.ts +++ b/packages/ldo/src/util.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import type { Dataset, Quad } from "@rdfjs/types"; import type { SetProxy, SubjectProxy } from "@ldo/jsonld-dataset-proxy"; import { @@ -12,8 +12,6 @@ import type { ITransactionDataset, } from "@ldo/subscribable-dataset"; -const { namedNode } = rdfdm; - /** * @category Types * `LdoBase` is an interface defining that a Linked Data Object is a JavaScript Object Literal. diff --git a/packages/ldo/test/LdoDataset.test.ts b/packages/ldo/test/LdoDataset.test.ts index c3cc194..d38eff4 100644 --- a/packages/ldo/test/LdoDataset.test.ts +++ b/packages/ldo/test/LdoDataset.test.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode, quad, literal } from "@ldo/rdf-utils"; import { createDataset } from "@ldo/dataset"; import type { SolidProfileShape } from "./profileData.js"; import { ProfileShapeType } from "./profileData.js"; @@ -14,8 +14,6 @@ import { sampleJsonld, sampleTurtle } from "./sampleData.js"; import type { SubjectProxy } from "@ldo/jsonld-dataset-proxy"; import { _proxyContext } from "@ldo/jsonld-dataset-proxy"; -const { namedNode, quad, literal } = rdfdm; - describe("LdoDataset", () => { let ldoDataset: LdoDataset; let profileBuilder: LdoBuilder; diff --git a/packages/ldo/test/methods.test.ts b/packages/ldo/test/methods.test.ts index 56e4d43..e4bfe66 100644 --- a/packages/ldo/test/methods.test.ts +++ b/packages/ldo/test/methods.test.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode } from "@ldo/rdf-utils"; import type { SubjectProxy } from "@ldo/jsonld-dataset-proxy"; import { getProxyFromObject, @@ -26,8 +26,6 @@ import { } from "../src/index.js"; import type { ILdoDataset } from "../src/types.js"; -const { namedNode } = rdfdm; - describe("methods", () => { let dataset: ILdoDataset; let profile: SolidProfileShape; diff --git a/packages/rdf-utils/package.json b/packages/rdf-utils/package.json index 9313f94..f164631 100644 --- a/packages/rdf-utils/package.json +++ b/packages/rdf-utils/package.json @@ -49,4 +49,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/rdf-utils/src/datasetChanges.d.ts b/packages/rdf-utils/src/datasetChanges.d.ts deleted file mode 100644 index 54b27a0..0000000 --- a/packages/rdf-utils/src/datasetChanges.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { BaseQuad, Dataset, Quad } from "@rdfjs/types"; -export interface DatasetChanges { - added?: Dataset; - removed?: Dataset; -} -export declare function changesToSparqlUpdate(changes: DatasetChanges): Promise; -//# sourceMappingURL=datasetChanges.d.ts.map \ No newline at end of file diff --git a/packages/rdf-utils/src/datasetChanges.d.ts.map b/packages/rdf-utils/src/datasetChanges.d.ts.map deleted file mode 100644 index dfe14ab..0000000 --- a/packages/rdf-utils/src/datasetChanges.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"datasetChanges.d.ts","sourceRoot":"","sources":["datasetChanges.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAO5D,MAAM,WAAW,cAAc,CAAC,YAAY,SAAS,QAAQ,GAAG,QAAQ;IACtE,KAAK,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;IAC5C,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;CAC/C;AAOD,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,cAAc,CAAC,IAAI,CAAC,mBAsBxE"} \ No newline at end of file diff --git a/packages/rdf-utils/src/datasetChanges.js b/packages/rdf-utils/src/datasetChanges.js deleted file mode 100644 index cd3190b..0000000 --- a/packages/rdf-utils/src/datasetChanges.js +++ /dev/null @@ -1,25 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.changesToSparqlUpdate = changesToSparqlUpdate; -const data_model_1 = require("@rdfjs/data-model"); -const datasetConverters_js_1 = require("./datasetConverters.js"); -async function changesToSparqlUpdate(changes) { - let output = ""; - if (changes.removed) { - const removedTriples = changes.removed.map((quad) => (0, data_model_1.quad)(quad.subject, quad.predicate, quad.object)); - output += `DELETE DATA { ${await (0, datasetConverters_js_1.datasetToString)(removedTriples, { - format: "N-Triples", - })} }`; - } - if (changes.added && changes.removed) { - output += "; "; - } - if (changes.added) { - const addedTriples = changes.added.map((quad) => (0, data_model_1.quad)(quad.subject, quad.predicate, quad.object)); - output += `INSERT DATA { ${await (0, datasetConverters_js_1.datasetToString)(addedTriples, { - format: "N-Triples", - })} }`; - } - return output.replaceAll("\n", " "); -} -//# sourceMappingURL=datasetChanges.js.map \ No newline at end of file diff --git a/packages/rdf-utils/src/datasetChanges.js.map b/packages/rdf-utils/src/datasetChanges.js.map deleted file mode 100644 index ca37be1..0000000 --- a/packages/rdf-utils/src/datasetChanges.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"datasetChanges.js","sourceRoot":"","sources":["datasetChanges.ts"],"names":[],"mappings":";;AAiBA,sDAsBC;AAtCD,kDAAuD;AACvD,iEAAyD;AAelD,KAAK,UAAU,qBAAqB,CAAC,OAA6B;IACvE,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAClD,IAAA,iBAAU,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CACtD,CAAC;QACF,MAAM,IAAI,iBAAiB,MAAM,IAAA,sCAAe,EAAC,cAAc,EAAE;YAC/D,MAAM,EAAE,WAAW;SACpB,CAAC,IAAI,CAAC;IACT,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACrC,MAAM,IAAI,IAAI,CAAC;IACjB,CAAC;IACD,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9C,IAAA,iBAAU,EAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CACtD,CAAC;QACF,MAAM,IAAI,iBAAiB,MAAM,IAAA,sCAAe,EAAC,YAAY,EAAE;YAC7D,MAAM,EAAE,WAAW;SACpB,CAAC,IAAI,CAAC;IACT,CAAC;IACD,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AACtC,CAAC"} \ No newline at end of file diff --git a/packages/rdf-utils/src/datasetChanges.ts b/packages/rdf-utils/src/datasetChanges.ts index 38b3198..6d60532 100644 --- a/packages/rdf-utils/src/datasetChanges.ts +++ b/packages/rdf-utils/src/datasetChanges.ts @@ -1,9 +1,7 @@ import type { BaseQuad, Dataset, Quad } from "@rdfjs/types"; -import * as rdfdm from "@rdfjs/data-model"; +import { quad as createQuad } from "./rdfjsDataModel.js"; import { datasetToString } from "./datasetConverters.js"; -const { quad: createQuad } = rdfdm; - /** * An interface representing the changes made */ diff --git a/packages/rdf-utils/src/datasetConverters.d.ts b/packages/rdf-utils/src/datasetConverters.d.ts deleted file mode 100644 index d2928fd..0000000 --- a/packages/rdf-utils/src/datasetConverters.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { DatasetCore, Quad } from "@rdfjs/types"; -import type { ContextDefinition, JsonLdDocument } from "jsonld"; -import type { WriterOptions as WriterOptionsImport } from "n3"; -export type WriterOptions = WriterOptionsImport; -export declare function datasetToString(dataset: DatasetCore, options: WriterOptions): string; -export declare function datasetToJsonLd(_dataset: DatasetCore, _context: ContextDefinition): Promise; -//# sourceMappingURL=datasetConverters.d.ts.map \ No newline at end of file diff --git a/packages/rdf-utils/src/datasetConverters.d.ts.map b/packages/rdf-utils/src/datasetConverters.d.ts.map deleted file mode 100644 index 25258e1..0000000 --- a/packages/rdf-utils/src/datasetConverters.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"datasetConverters.d.ts","sourceRoot":"","sources":["datasetConverters.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACtD,OAAO,KAAK,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,KAAK,EAAE,aAAa,IAAI,mBAAmB,EAAE,MAAM,IAAI,CAAC;AAK/D,MAAM,MAAM,aAAa,GAAG,mBAAmB,CAAC;AAEhD,wBAAgB,eAAe,CAC7B,OAAO,EAAE,WAAW,CAAC,IAAI,CAAC,EAC1B,OAAO,EAAE,aAAa,GACrB,MAAM,CAOR;AAED,wBAAsB,eAAe,CACnC,QAAQ,EAAE,WAAW,EACrB,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,cAAc,CAAC,CAEzB"} \ No newline at end of file diff --git a/packages/rdf-utils/src/datasetConverters.js b/packages/rdf-utils/src/datasetConverters.js deleted file mode 100644 index f470697..0000000 --- a/packages/rdf-utils/src/datasetConverters.js +++ /dev/null @@ -1,17 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.datasetToString = datasetToString; -exports.datasetToJsonLd = datasetToJsonLd; -const n3_1 = require("n3"); -function datasetToString(dataset, options) { - const writer = new n3_1.Writer(options); - const quadArr = []; - for (const quad of dataset) { - quadArr.push(quad); - } - return writer.quadsToString(quadArr); -} -async function datasetToJsonLd(_dataset, _context) { - throw new Error("JSONLD serialization is not omplemented"); -} -//# sourceMappingURL=datasetConverters.js.map \ No newline at end of file diff --git a/packages/rdf-utils/src/datasetConverters.js.map b/packages/rdf-utils/src/datasetConverters.js.map deleted file mode 100644 index 82e4f9a..0000000 --- a/packages/rdf-utils/src/datasetConverters.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"datasetConverters.js","sourceRoot":"","sources":["datasetConverters.ts"],"names":[],"mappings":";;AASA,0CAUC;AAED,0CAKC;AAvBD,2BAA4B;AAM5B,SAAgB,eAAe,CAC7B,OAA0B,EAC1B,OAAsB;IAEtB,MAAM,MAAM,GAAG,IAAI,WAAM,CAAC,OAAO,CAAC,CAAC;IACnC,MAAM,OAAO,GAAW,EAAE,CAAC;IAC3B,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;QAC3B,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IACD,OAAO,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC;AAEM,KAAK,UAAU,eAAe,CACnC,QAAqB,EACrB,QAA2B;IAE3B,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAC;AAC7D,CAAC"} \ No newline at end of file diff --git a/packages/rdf-utils/src/index.d.ts b/packages/rdf-utils/src/index.d.ts deleted file mode 100644 index b3f4641..0000000 --- a/packages/rdf-utils/src/index.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -export * from "./nodeSerialization.js"; -export * from "./datasetChanges.js"; -export * from "./datasetConverters.js"; -export * from "./serializedToQuads.js"; -//# sourceMappingURL=index.d.ts.map \ No newline at end of file diff --git a/packages/rdf-utils/src/index.d.ts.map b/packages/rdf-utils/src/index.d.ts.map deleted file mode 100644 index 22c0013..0000000 --- a/packages/rdf-utils/src/index.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,qBAAqB,CAAC;AACpC,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC"} \ No newline at end of file diff --git a/packages/rdf-utils/src/index.js b/packages/rdf-utils/src/index.js deleted file mode 100644 index 413fcb2..0000000 --- a/packages/rdf-utils/src/index.js +++ /dev/null @@ -1,21 +0,0 @@ -"use strict"; -var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - var desc = Object.getOwnPropertyDescriptor(m, k); - if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) { - desc = { enumerable: true, get: function() { return m[k]; } }; - } - Object.defineProperty(o, k2, desc); -}) : (function(o, m, k, k2) { - if (k2 === undefined) k2 = k; - o[k2] = m[k]; -})); -var __exportStar = (this && this.__exportStar) || function(m, exports) { - for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); -}; -Object.defineProperty(exports, "__esModule", { value: true }); -__exportStar(require("./nodeSerialization.js"), exports); -__exportStar(require("./datasetChanges.js"), exports); -__exportStar(require("./datasetConverters.js"), exports); -__exportStar(require("./serializedToQuads.js"), exports); -//# sourceMappingURL=index.js.map \ No newline at end of file diff --git a/packages/rdf-utils/src/index.js.map b/packages/rdf-utils/src/index.js.map deleted file mode 100644 index 8054fc8..0000000 --- a/packages/rdf-utils/src/index.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yDAAuC;AACvC,sDAAoC;AACpC,yDAAuC;AACvC,yDAAuC"} \ No newline at end of file diff --git a/packages/rdf-utils/src/index.ts b/packages/rdf-utils/src/index.ts index 622ee5c..1841b12 100644 --- a/packages/rdf-utils/src/index.ts +++ b/packages/rdf-utils/src/index.ts @@ -2,3 +2,4 @@ export * from "./nodeSerialization.js"; export * from "./datasetChanges.js"; export * from "./datasetConverters.js"; export * from "./serializedToQuads.js"; +export * from "./rdfjsDataModel.js"; diff --git a/packages/rdf-utils/src/nodeSerialization.d.ts b/packages/rdf-utils/src/nodeSerialization.d.ts deleted file mode 100644 index 2b4199f..0000000 --- a/packages/rdf-utils/src/nodeSerialization.d.ts +++ /dev/null @@ -1,39 +0,0 @@ -import type { Quad, Term, BlankNode, DefaultGraph, Literal, NamedNode } from "@rdfjs/types"; -export type NodeTermTypes = Set; -export type SubjectNode = NamedNode | BlankNode; -export declare const SubjectTermTypes: NodeTermTypes; -export type PredicateNode = NamedNode; -export declare const PredicateTermTypes: NodeTermTypes; -export type ObjectNode = NamedNode | BlankNode | Literal; -export declare const ObjectTermTypes: NodeTermTypes; -export type GraphNode = NamedNode | BlankNode | DefaultGraph; -export declare const GraphTermTypes: NodeTermTypes; -export type AnyNode = SubjectNode | PredicateNode | ObjectNode | GraphNode; -export declare const AnyTermTypes: NodeTermTypes; -export interface SimpleQuad extends Quad { - subject: SubjectNode; - predicate: PredicateNode; - object: ObjectNode; - graph: GraphNode; -} -export type QuadMatch = [ - SubjectNode | undefined | null, - PredicateNode | undefined | null, - ObjectNode | undefined | null, - GraphNode | undefined | null -]; -export declare function subjectNodeToString(node: SubjectNode): string; -export declare function predicateNodeToString(node: PredicateNode): string; -export declare function objectNodeToString(node: ObjectNode): string; -export declare function grpahNodeToString(node: GraphNode): string; -export declare function nodeToString(node: AnyNode): string; -export declare function quadToString(quad: Quad): string; -export declare function quadMatchToString(quadMatch: QuadMatch): string; -export declare function stringToSubjectNode(input: string): SubjectNode; -export declare function stringToPredicateNode(input: string): PredicateNode; -export declare function stringToObjectNode(input: string): ObjectNode; -export declare function stringToGraphNode(input: string): GraphNode; -export declare function stringToNode(input: string, expectTermType?: NodeTermTypes): AnyNode; -export declare function stringToQuad(input: string): import("rdf-js").Quad; -export declare function stringToQuadMatch(input: string): QuadMatch; -//# sourceMappingURL=nodeSerialization.d.ts.map \ No newline at end of file diff --git a/packages/rdf-utils/src/nodeSerialization.d.ts.map b/packages/rdf-utils/src/nodeSerialization.d.ts.map deleted file mode 100644 index 7da6054..0000000 --- a/packages/rdf-utils/src/nodeSerialization.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"nodeSerialization.d.ts","sourceRoot":"","sources":["nodeSerialization.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,YAAY,EACZ,OAAO,EACP,SAAS,EACV,MAAM,cAAc,CAAC;AAiBtB,MAAM,MAAM,aAAa,CAAC,IAAI,SAAS,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;AAErE,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG,SAAS,CAAC;AAChD,eAAO,MAAM,gBAAgB,EAAE,aAAa,CAAC,WAAW,CAGtD,CAAC;AACH,MAAM,MAAM,aAAa,GAAG,SAAS,CAAC;AACtC,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,aAAa,CAE1D,CAAC;AACH,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;AACzD,eAAO,MAAM,eAAe,EAAE,aAAa,CAAC,UAAU,CAIpD,CAAC;AACH,MAAM,MAAM,SAAS,GAAG,SAAS,GAAG,SAAS,GAAG,YAAY,CAAC;AAC7D,eAAO,MAAM,cAAc,EAAE,aAAa,CAAC,SAAS,CAIlD,CAAC;AACH,MAAM,MAAM,OAAO,GAAG,WAAW,GAAG,aAAa,GAAG,UAAU,GAAG,SAAS,CAAC;AAC3E,eAAO,MAAM,YAAY,EAAE,aAAa,CAAC,OAAO,CAK9C,CAAC;AAEH,MAAM,WAAW,UAAW,SAAQ,IAAI;IAKtC,OAAO,EAAE,WAAW,CAAC;IAKrB,SAAS,EAAE,aAAa,CAAC;IAKzB,MAAM,EAAE,UAAU,CAAC;IAKnB,KAAK,EAAE,SAAS,CAAC;CAClB;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,WAAW,GAAG,SAAS,GAAG,IAAI;IAC9B,aAAa,GAAG,SAAS,GAAG,IAAI;IAChC,UAAU,GAAG,SAAS,GAAG,IAAI;IAC7B,SAAS,GAAG,SAAS,GAAG,IAAI;CAC7B,CAAC;AAaF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,UAEpD;AAOD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,aAAa,UAExD;AAOD,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,UAElD;AAOD,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,SAAS,UAEhD;AAOD,wBAAgB,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAElD;AAOD,wBAAgB,YAAY,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,CAE/C;AAOD,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,SAAS,GAAG,MAAM,CAO9D;AAaD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAE9D;AAOD,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,aAAa,CAElE;AAOD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,UAAU,CAE5D;AAOD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAE1D;AAOD,wBAAgB,YAAY,CAC1B,KAAK,EAAE,MAAM,EACb,cAAc,CAAC,EAAE,aAAa,CAAC,IAAI,CAAC,GACnC,OAAO,CAYT;AAOD,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,yBAMzC;AAOD,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAkB1D"} \ No newline at end of file diff --git a/packages/rdf-utils/src/nodeSerialization.js b/packages/rdf-utils/src/nodeSerialization.js deleted file mode 100644 index 93d34a7..0000000 --- a/packages/rdf-utils/src/nodeSerialization.js +++ /dev/null @@ -1,115 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.AnyTermTypes = exports.GraphTermTypes = exports.ObjectTermTypes = exports.PredicateTermTypes = exports.SubjectTermTypes = void 0; -exports.subjectNodeToString = subjectNodeToString; -exports.predicateNodeToString = predicateNodeToString; -exports.objectNodeToString = objectNodeToString; -exports.grpahNodeToString = grpahNodeToString; -exports.nodeToString = nodeToString; -exports.quadToString = quadToString; -exports.quadMatchToString = quadMatchToString; -exports.stringToSubjectNode = stringToSubjectNode; -exports.stringToPredicateNode = stringToPredicateNode; -exports.stringToObjectNode = stringToObjectNode; -exports.stringToGraphNode = stringToGraphNode; -exports.stringToNode = stringToNode; -exports.stringToQuad = stringToQuad; -exports.stringToQuadMatch = stringToQuadMatch; -const rdf_string_1 = require("rdf-string"); -exports.SubjectTermTypes = new Set([ - "NamedNode", - "BlankNode", -]); -exports.PredicateTermTypes = new Set([ - "NamedNode", -]); -exports.ObjectTermTypes = new Set([ - "NamedNode", - "BlankNode", - "Literal", -]); -exports.GraphTermTypes = new Set([ - "NamedNode", - "BlankNode", - "DefaultGraph", -]); -exports.AnyTermTypes = new Set([ - "NamedNode", - "BlankNode", - "DefaultGraph", - "Literal", -]); -function subjectNodeToString(node) { - return nodeToString(node); -} -function predicateNodeToString(node) { - return nodeToString(node); -} -function objectNodeToString(node) { - return nodeToString(node); -} -function grpahNodeToString(node) { - return nodeToString(node); -} -function nodeToString(node) { - return (0, rdf_string_1.termToString)(node); -} -function quadToString(quad) { - return JSON.stringify((0, rdf_string_1.quadToStringQuad)(quad)); -} -function quadMatchToString(quadMatch) { - return JSON.stringify({ - subject: quadMatch[0] ? subjectNodeToString(quadMatch[0]) : undefined, - predicate: quadMatch[1] ? predicateNodeToString(quadMatch[1]) : undefined, - object: quadMatch[2] ? objectNodeToString(quadMatch[2]) : undefined, - graph: quadMatch[3] ? grpahNodeToString(quadMatch[3]) : undefined, - }); -} -function stringToSubjectNode(input) { - return stringToNode(input, exports.SubjectTermTypes); -} -function stringToPredicateNode(input) { - return stringToNode(input, exports.PredicateTermTypes); -} -function stringToObjectNode(input) { - return stringToNode(input, exports.ObjectTermTypes); -} -function stringToGraphNode(input) { - return stringToNode(input, exports.GraphTermTypes); -} -function stringToNode(input, expectTermType) { - const node = (0, rdf_string_1.stringToTerm)(input); - if (expectTermType && !expectTermType.has(node.termType)) { - throw new Error(`Expected term to be one of term type: [${Array.from(expectTermType).reduce((agg, termType) => `${agg}${termType}, `, "")}], but got ${node.termType}.`); - } - return node; -} -function stringToQuad(input) { - try { - return (0, rdf_string_1.stringQuadToQuad)(JSON.parse(input)); - } - catch (err) { - throw new Error("Invalid Quad String"); - } -} -function stringToQuadMatch(input) { - try { - const jsonRep = JSON.parse(input); - return [ - jsonRep.subject != undefined - ? stringToSubjectNode(jsonRep.subject) - : undefined, - jsonRep.predicate != undefined - ? stringToPredicateNode(jsonRep.predicate) - : undefined, - jsonRep.object != undefined - ? stringToObjectNode(jsonRep.object) - : undefined, - jsonRep.graph != undefined ? stringToGraphNode(jsonRep.graph) : undefined, - ]; - } - catch (err) { - throw new Error("Invalid Quad Match String"); - } -} -//# sourceMappingURL=nodeSerialization.js.map \ No newline at end of file diff --git a/packages/rdf-utils/src/nodeSerialization.js.map b/packages/rdf-utils/src/nodeSerialization.js.map deleted file mode 100644 index a20b1f3..0000000 --- a/packages/rdf-utils/src/nodeSerialization.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"nodeSerialization.js","sourceRoot":"","sources":["nodeSerialization.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/packages/rdf-utils/src/rdfjsDataModel.ts b/packages/rdf-utils/src/rdfjsDataModel.ts new file mode 100644 index 0000000..3945aa1 --- /dev/null +++ b/packages/rdf-utils/src/rdfjsDataModel.ts @@ -0,0 +1,27 @@ +/* eslint-disable @typescript-eslint/ban-ts-comment */ +// src/utils/rdfjs-data-model-interop.ts +import * as rdfdmNamespace from "@rdfjs/data-model"; + +// The interop shim +let RdfDataModelResolved; +if ( + // @ts-ignore + rdfdmNamespace.default && + // @ts-ignore + typeof rdfdmNamespace.default.namedNode === "function" +) { + // @ts-ignore + RdfDataModelResolved = rdfdmNamespace.default; +} else { + RdfDataModelResolved = rdfdmNamespace; +} + +export const quad: (typeof rdfdmNamespace)["quad"] = RdfDataModelResolved.quad; +export const namedNode: (typeof rdfdmNamespace)["namedNode"] = + RdfDataModelResolved.namedNode; +export const blankNode: (typeof rdfdmNamespace)["blankNode"] = + RdfDataModelResolved.blankNode; +export const literal: (typeof rdfdmNamespace)["literal"] = + RdfDataModelResolved.literal; +export const defaultGraph: (typeof rdfdmNamespace)["defaultGraph"] = + RdfDataModelResolved.defaultGraph; diff --git a/packages/rdf-utils/src/serializedToQuads.d.ts b/packages/rdf-utils/src/serializedToQuads.d.ts deleted file mode 100644 index c825454..0000000 --- a/packages/rdf-utils/src/serializedToQuads.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { Quad } from "@rdfjs/types"; -import type { ParserOptions as ParserOptionsImport } from "n3"; -export type ParserOptions = ParserOptionsImport; -export declare function serializedToQuads(data: string, options?: ParserOptions): Promise; -//# sourceMappingURL=serializedToQuads.d.ts.map \ No newline at end of file diff --git a/packages/rdf-utils/src/serializedToQuads.d.ts.map b/packages/rdf-utils/src/serializedToQuads.d.ts.map deleted file mode 100644 index eb6d2dc..0000000 --- a/packages/rdf-utils/src/serializedToQuads.d.ts.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"serializedToQuads.d.ts","sourceRoot":"","sources":["serializedToQuads.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,IAAI,mBAAmB,EAAE,MAAM,IAAI,CAAC;AAG/D,MAAM,MAAM,aAAa,GAAG,mBAAmB,CAAC;AAEhD,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,MAAM,EACZ,OAAO,CAAC,EAAE,aAAa,GACtB,OAAO,CAAC,IAAI,EAAE,CAAC,CAiCjB"} \ No newline at end of file diff --git a/packages/rdf-utils/src/serializedToQuads.js b/packages/rdf-utils/src/serializedToQuads.js deleted file mode 100644 index 6431437..0000000 --- a/packages/rdf-utils/src/serializedToQuads.js +++ /dev/null @@ -1,12 +0,0 @@ -"use strict"; -Object.defineProperty(exports, "__esModule", { value: true }); -exports.serializedToQuads = serializedToQuads; -const n3_1 = require("n3"); -async function serializedToQuads(data, options) { - if (options && options.format === "application/ld+json") { - throw new Error("Not Implemented"); - } - const parser = new n3_1.Parser(options); - return parser.parse(data); -} -//# sourceMappingURL=serializedToQuads.js.map \ No newline at end of file diff --git a/packages/rdf-utils/src/serializedToQuads.js.map b/packages/rdf-utils/src/serializedToQuads.js.map deleted file mode 100644 index c7fc85c..0000000 --- a/packages/rdf-utils/src/serializedToQuads.js.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"file":"serializedToQuads.js","sourceRoot":"","sources":["serializedToQuads.ts"],"names":[],"mappings":";;AAMA,8CAoCC;AAxCD,2BAA4B;AAIrB,KAAK,UAAU,iBAAiB,CACrC,IAAY,EACZ,OAAuB;IAGvB,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,qBAAqB,EAAE,CAAC;QACxD,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;IA0BrC,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,WAAM,CAAC,OAAwB,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"} \ No newline at end of file diff --git a/packages/react/package.json b/packages/react/package.json index 295b5f9..aa2add4 100644 --- a/packages/react/package.json +++ b/packages/react/package.json @@ -45,7 +45,6 @@ "@ldo/ldo": "^1.0.0-alpha.20", "@ldo/rdf-utils": "^1.0.0-alpha.19", "@ldo/subscribable-dataset": "^1.0.0-alpha.20", - "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, "files": [ @@ -56,4 +55,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/solid-react/package.json b/packages/solid-react/package.json index a4ea4bf..3c2985a 100644 --- a/packages/solid-react/package.json +++ b/packages/solid-react/package.json @@ -47,7 +47,6 @@ "@ldo/connected": "^1.0.0-alpha.20", "@ldo/connected-solid": "^1.0.0-alpha.20", "@ldo/react": "^1.0.0-alpha.20", - "@rdfjs/data-model": "^1.2.0", "cross-fetch": "^3.1.6" }, "files": [ @@ -58,4 +57,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/solid-type-index/src/setTypeIndex.ts b/packages/solid-type-index/src/setTypeIndex.ts index 4ffddc4..ea466a4 100644 --- a/packages/solid-type-index/src/setTypeIndex.ts +++ b/packages/solid-type-index/src/setTypeIndex.ts @@ -2,7 +2,7 @@ import { v4 } from "uuid"; import { FOR_CLASS, RDF_TYPE, TYPE_REGISTRATION } from "./constants.js"; import { guaranteeOptions, type Options } from "./util/Options.js"; -import * as rdfdm from "@rdfjs/data-model"; +import { namedNode, quad } from "@ldo/rdf-utils"; import type { TypeRegistration } from "./.ldo/typeIndex.typings.js"; import { getProfile } from "./getTypeIndex.js"; import { TypeIndexProfileShapeType } from "./.ldo/profile.shapeTypes.js"; @@ -20,8 +20,6 @@ import { TypeRegistrationShapeType, } from "./.ldo/typeIndex.shapeTypes.js"; -const { namedNode, quad } = rdfdm; - /** * ============================================================================= * INITIALIZERS diff --git a/packages/solid-type-index/test/General.test.tsx b/packages/solid-type-index/test/General.test.tsx index 02732ed..e240c34 100644 --- a/packages/solid-type-index/test/General.test.tsx +++ b/packages/solid-type-index/test/General.test.tsx @@ -16,15 +16,13 @@ import { removeRegistration, } from "../src/setTypeIndex.js"; import { TypeIndexProfileShapeType } from "../src/.ldo/profile.shapeTypes.js"; -import * as rdfdm from "@rdfjs/dataset"; import { INSTANCE } from "../src/constants.js"; import { createSolidLdoDataset } from "@ldo/connected-solid"; import { dirname, join } from "node:path"; import { fileURLToPath } from "node:url"; import { setupServer } from "@ldo/test-solid-server"; import { it, expect, describe, afterEach } from "vitest"; - -const { namedNode } = rdfdm; +import { namedNode } from "@ldo/rdf-utils"; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore diff --git a/packages/subscribable-dataset/Readme.md b/packages/subscribable-dataset/Readme.md index a1f98cd..1adccbb 100644 --- a/packages/subscribable-dataset/Readme.md +++ b/packages/subscribable-dataset/Readme.md @@ -12,8 +12,7 @@ npm i @ldo/subscribable-dataset ```typescript import { createSubscribableDataset, DatasetChanges } from "@ldo/subscribable-dataset"; import { Dataset } from "@rdfjs/types"; -import * as rdfdm from '@rdfjs/data-model'; -const { quad, namedNode } = rdfdm; +import { quad, namedNode }from '@ldo/rdf-utils'; const subscribableDataset = createSubscribableDataset([ quad( @@ -100,9 +99,8 @@ run(); ```typescript import { createSubscribableDataset, DatasetChanges } from "@ldo/subscribable-dataset"; -import * as rdfdm from '@rdfjs/data-model'; +import { quad, namedNode, literal } from '@ldo/rdf-utils'; import { Dataset } from "@rdfjs/types"; -const { quad, namedNode, literal } = rdfdm; // Create an empty subscribable dataset const subscribableDataset = createSubscribableDataset(); diff --git a/packages/subscribable-dataset/example/subscribableDatasetExample.ts b/packages/subscribable-dataset/example/subscribableDatasetExample.ts index 6e0b4b3..4c43516 100644 --- a/packages/subscribable-dataset/example/subscribableDatasetExample.ts +++ b/packages/subscribable-dataset/example/subscribableDatasetExample.ts @@ -1,9 +1,7 @@ import { createSubscribableDataset } from "../src/index.js"; -import * as rdfdm from "@rdfjs/data-model"; +import { quad, namedNode, literal } from "@ldo/rdf-utils"; import type { DatasetChanges } from "@ldo/rdf-utils"; -const { quad, namedNode, literal } = rdfdm; - // Create an empty subscribable dataset const subscribableDataset = createSubscribableDataset(); // Add some initial quads diff --git a/packages/subscribable-dataset/package.json b/packages/subscribable-dataset/package.json index 6404313..f021fb5 100644 --- a/packages/subscribable-dataset/package.json +++ b/packages/subscribable-dataset/package.json @@ -34,7 +34,6 @@ }, "homepage": "https://github.com/o-development/ldo/tree/main/packages/subscribable-dataset#readme", "devDependencies": { - "@rdfjs/data-model": "^1.2.0", "@rdfjs/dataset": "^1.1.0", "@rdfjs/types": "^1.0.1", "@types/jsonld": "^1.5.6", @@ -55,4 +54,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file diff --git a/packages/subscribable-dataset/test/SubscribableDataset.test.ts b/packages/subscribable-dataset/test/SubscribableDataset.test.ts index ae03011..7ee3be2 100644 --- a/packages/subscribable-dataset/test/SubscribableDataset.test.ts +++ b/packages/subscribable-dataset/test/SubscribableDataset.test.ts @@ -7,7 +7,7 @@ import { quad, defaultGraph, blankNode, -} from "@rdfjs/data-model"; +} from "@ldo/rdf-utils"; import type { Quad, BlankNode } from "@rdfjs/types"; // eslint-disable-next-line @typescript-eslint/ban-ts-comment // @ts-ignore diff --git a/packages/subscribable-dataset/test/TransactionalDataset.test.ts b/packages/subscribable-dataset/test/TransactionalDataset.test.ts index a02d22c..7f05435 100644 --- a/packages/subscribable-dataset/test/TransactionalDataset.test.ts +++ b/packages/subscribable-dataset/test/TransactionalDataset.test.ts @@ -1,4 +1,4 @@ -import * as rdfdm from "@rdfjs/data-model"; +import { quad, namedNode, literal } from "@ldo/rdf-utils"; import type { Dataset, DatasetCoreFactory, @@ -14,8 +14,6 @@ import { } from "../src/index.js"; import datasetCoreFactory from "@rdfjs/dataset"; -const { quad, namedNode, literal } = rdfdm; - describe("TransactionDataset", () => { let parentDataset: ISubscribableDataset; let transactionalDataset: TransactionDataset; diff --git a/packages/svelte/package.json b/packages/svelte/package.json index 94d516d..aa534a5 100644 --- a/packages/svelte/package.json +++ b/packages/svelte/package.json @@ -69,7 +69,6 @@ "@ldo/ldo": "^1.0.0-alpha.20", "@ldo/rdf-utils": "^1.0.0-alpha.19", "@ldo/subscribable-dataset": "^1.0.0-alpha.20", - "@rdfjs/data-model": "^1.2.0", "tsx": "^4.19.4" }, "files": [ @@ -80,4 +79,4 @@ "access": "public" }, "gitHead": "840910c56ec3f61416f031cc76771a5673af6757" -} +} \ No newline at end of file