From 3dca95f5487d9288bef96a4a3a79cc2e8e4ba3f2 Mon Sep 17 00:00:00 2001 From: Jackson Morgan Date: Fri, 23 May 2025 15:49:58 -0400 Subject: [PATCH] Updated imports for @rdfjs/data-model --- package-lock.json | 4 ++-- .../src/resources/NextGraphResource.ts | 4 +++- packages/connected-nextgraph/test/integration.test.ts | 4 +++- .../src/requester/requests/deleteResource.ts | 4 +++- .../src/requester/requests/readResource.ts | 4 +++- packages/connected-solid/src/resources/SolidContainer.ts | 4 +++- packages/connected-solid/src/util/rdfUtils.ts | 4 +++- packages/connected-solid/test/LeafRequester.test.ts | 2 +- packages/connected/package.json | 6 +++--- .../connected/src/trackingProxy/TrackingSubjectProxy.ts | 4 +++- .../connected/src/trackingProxy/createTrackingProxy.ts | 4 +++- packages/connected/src/util/splitChangesByGraph.ts | 4 +++- packages/dataset/Readme.md | 8 ++++++-- packages/dataset/example/extendedDatasetExample.ts | 4 +++- packages/dataset/test/createExtendedDataset.test.ts | 4 +++- packages/dataset/test/dataset.testHelper.ts | 4 +++- packages/jsonld-dataset-proxy/README.md | 3 ++- .../src/JsonldDatasetProxyBuilder.ts | 4 +++- packages/jsonld-dataset-proxy/src/ProxyContext.ts | 4 +++- packages/jsonld-dataset-proxy/src/graphOf.ts | 4 +++- packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts | 4 +++- .../src/language/languageMapProxy.ts | 4 +++- .../jsonld-dataset-proxy/src/language/languageSet.ts | 4 +++- .../jsonld-dataset-proxy/src/language/languagesOf.ts | 4 +++- .../jsonld-dataset-proxy/src/setProxy/SubjectSetProxy.ts | 4 +++- .../src/setProxy/ldSet/BasicLdSet.ts | 4 +++- .../src/subjectProxy/createSubjectHandler.ts | 3 ++- .../src/subjectProxy/getValueForKey.ts | 4 +++- .../jsonld-dataset-proxy/src/util/addObjectToDataset.ts | 4 +++- packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts | 4 +++- packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts | 9 +++++++-- packages/jsonld-dataset-proxy/test/ContextUtil.test.ts | 4 +++- .../test/nodeToJsonRepresentation.test.ts | 4 +++- packages/jsonld-dataset-proxy/test/nodeToString.test.ts | 4 +++- packages/ldo/src/util.ts | 4 +++- packages/ldo/test/LdoDataset.test.ts | 4 +++- packages/ldo/test/methods.test.ts | 4 +++- packages/rdf-utils/src/datasetChanges.ts | 4 +++- packages/solid-type-index/src/setTypeIndex.ts | 4 +++- packages/subscribable-dataset/Readme.md | 6 ++++-- .../example/subscribableDatasetExample.ts | 4 +++- .../test/TransactionalDataset.test.ts | 4 +++- 42 files changed, 129 insertions(+), 48 deletions(-) diff --git a/package-lock.json b/package-lock.json index 073837b..b296e4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30401,12 +30401,12 @@ "dependencies": { "@ldo/dataset": "^1.0.0-alpha.14", "@ldo/ldo": "^1.0.0-alpha.14", - "@ldo/rdf-utils": "^1.0.0-alpha.14" + "@ldo/rdf-utils": "^1.0.0-alpha.14", + "@rdfjs/data-model": "^1.2.0" }, "devDependencies": { "@ldo/connected-solid": "^1.0.0-alpha.18", "@ldo/test-solid-server": "^1.0.0-alpha.14", - "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "cross-env": "^7.0.3", "jest-rdf": "^1.8.0", diff --git a/packages/connected-nextgraph/src/resources/NextGraphResource.ts b/packages/connected-nextgraph/src/resources/NextGraphResource.ts index 4b624f0..c90ff8c 100644 --- a/packages/connected-nextgraph/src/resources/NextGraphResource.ts +++ b/packages/connected-nextgraph/src/resources/NextGraphResource.ts @@ -16,13 +16,15 @@ 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 { namedNode, quad as createQuad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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 c330cee..441ee76 100644 --- a/packages/connected-nextgraph/test/integration.test.ts +++ b/packages/connected-nextgraph/test/integration.test.ts @@ -7,12 +7,14 @@ import type { } from "../src/index.js"; import { createNextGraphLdoDataset } from "../src/createNextGraphLdoDataset.js"; import { parseRdf } from "@ldo/ldo"; -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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/src/requester/requests/deleteResource.ts b/packages/connected-solid/src/requester/requests/deleteResource.ts index 8c03fab..173c414 100644 --- a/packages/connected-solid/src/requester/requests/deleteResource.ts +++ b/packages/connected-solid/src/requester/requests/deleteResource.ts @@ -1,4 +1,4 @@ -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import { guaranteeFetch } from "../../util/guaranteeFetch.js"; import { deleteResourceRdfFromContainer } from "../../util/rdfUtils.js"; import type { Resource } from "@ldo/connected"; @@ -13,6 +13,8 @@ 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 bfe70f2..a3f533d 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 { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { SolidLeaf } from "../../resources/SolidLeaf.js"; import type { SolidContainer } from "../../resources/SolidContainer.js"; import { @@ -22,6 +22,8 @@ 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 0728190..47b3767 100644 --- a/packages/connected-solid/src/resources/SolidContainer.ts +++ b/packages/connected-solid/src/resources/SolidContainer.ts @@ -1,4 +1,4 @@ -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import { ContainerBatchedRequester } from "../requester/ContainerBatchedRequester.js"; import type { CheckRootResult, @@ -41,6 +41,8 @@ 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 f8dfde8..5767065 100644 --- a/packages/connected-solid/src/util/rdfUtils.ts +++ b/packages/connected-solid/src/util/rdfUtils.ts @@ -1,10 +1,12 @@ import type { LdoDataset } from "@ldo/ldo"; import { parseRdf } from "@ldo/ldo"; -import { namedNode, quad as createQuad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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/LeafRequester.test.ts b/packages/connected-solid/test/LeafRequester.test.ts index 0a307d0..3665988 100644 --- a/packages/connected-solid/test/LeafRequester.test.ts +++ b/packages/connected-solid/test/LeafRequester.test.ts @@ -3,7 +3,7 @@ // import type { SolidLdoDataset } from "../src/SolidLdoDataset.js"; // import { createSolidLdoDataset } from "../src/createSolidLdoDataset.js"; // import { LeafRequester } from "../src/requester/LeafRequester.js"; -// import { namedNode, quad as createQuad } from "@rdfjs/data-model"; +// 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 e7076dd..5d98353 100644 --- a/packages/connected/package.json +++ b/packages/connected/package.json @@ -37,7 +37,6 @@ "devDependencies": { "@ldo/connected-solid": "^1.0.0-alpha.18", "@ldo/test-solid-server": "^1.0.0-alpha.14", - "@rdfjs/data-model": "^1.2.0", "@rdfjs/types": "^1.0.1", "cross-env": "^7.0.3", "jest-rdf": "^1.8.0", @@ -52,7 +51,8 @@ "dependencies": { "@ldo/dataset": "^1.0.0-alpha.14", "@ldo/ldo": "^1.0.0-alpha.14", - "@ldo/rdf-utils": "^1.0.0-alpha.14" + "@ldo/rdf-utils": "^1.0.0-alpha.14", + "@rdfjs/data-model": "^1.2.0" }, "files": [ "dist", @@ -62,4 +62,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 f706b18..0d05c72 100644 --- a/packages/connected/src/trackingProxy/TrackingSubjectProxy.ts +++ b/packages/connected/src/trackingProxy/TrackingSubjectProxy.ts @@ -5,7 +5,9 @@ import { } from "@ldo/jsonld-dataset-proxy"; import type { BlankNode, NamedNode } from "@rdfjs/types"; import type { TrackingProxyContext } from "./TrackingProxyContext.js"; -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; + +const { namedNode } = rdfdm; /** * @internal diff --git a/packages/connected/src/trackingProxy/createTrackingProxy.ts b/packages/connected/src/trackingProxy/createTrackingProxy.ts index b764a27..04d0e8b 100644 --- a/packages/connected/src/trackingProxy/createTrackingProxy.ts +++ b/packages/connected/src/trackingProxy/createTrackingProxy.ts @@ -5,10 +5,12 @@ import { import { LdoBuilder } from "@ldo/ldo"; import type { LdoBase, LdoDataset, ShapeType } from "@ldo/ldo"; import { TrackingProxyContext } from "./TrackingProxyContext.js"; -import { defaultGraph } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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 007253f..78bb04e 100644 --- a/packages/connected/src/util/splitChangesByGraph.ts +++ b/packages/connected/src/util/splitChangesByGraph.ts @@ -1,7 +1,9 @@ import { createDataset } from "@ldo/dataset"; import type { GraphNode, DatasetChanges } from "@ldo/rdf-utils"; import type { Quad } from "@rdfjs/types"; -import { defaultGraph, namedNode, quad as createQuad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; + +const { defaultGraph, namedNode, quad: createQuad } = rdfdm; /** * @internal diff --git a/packages/dataset/Readme.md b/packages/dataset/Readme.md index e485aea..f1721d3 100644 --- a/packages/dataset/Readme.md +++ b/packages/dataset/Readme.md @@ -12,7 +12,10 @@ npm i @ldo/dataset ```typescript import { createDataset } from "@ldo/dataset"; -import { quad, namedNode } from "@rdfjs/data-model"; +import * as rdfdm from '@rdfjs/data-model'; +const { quad, namedNode } = rdfdm; + +imports: quad, namedNode as MyNamedNode const dataset = createDataset(); dataset.add( quad( @@ -35,7 +38,8 @@ The extended dataset implements all the [additional methods](https://rdf.js.org/ Usage: ```typescript import { createDataset } from "@ldo/dataset"; -import { quad, namedNode, literal } from "@rdfjs/data-model"; +import * as rdfdm from '@rdfjs/data-model'; +const { quad, namedNode, literal } = rdfdm; // Required for advanced features: import { dataset as initializeDatasetCore } from "@rdfjs/dataset"; import { ExtendedDatasetFactory } from "@ldo/dataset"; diff --git a/packages/dataset/example/extendedDatasetExample.ts b/packages/dataset/example/extendedDatasetExample.ts index dd4a5fb..e440617 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 { dataset as initializeDatasetCore } from "@rdfjs/dataset"; import { ExtendedDatasetFactory } from "../src/index.js"; -import { quad, namedNode, literal } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { Dataset, Quad, @@ -10,6 +10,8 @@ import type { DatasetCore, } from "@rdfjs/types"; +const { namedNode, quad, literal } = rdfdm; + /** * Create a dataset with default settings */ diff --git a/packages/dataset/test/createExtendedDataset.test.ts b/packages/dataset/test/createExtendedDataset.test.ts index 9fa6742..39fb69f 100644 --- a/packages/dataset/test/createExtendedDataset.test.ts +++ b/packages/dataset/test/createExtendedDataset.test.ts @@ -1,5 +1,7 @@ import { createDataset } from "../src/index.js"; -import { quad, namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; + +const { quad, namedNode } = rdfdm; 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 a6f2323..bbfbb41 100644 --- a/packages/dataset/test/dataset.testHelper.ts +++ b/packages/dataset/test/dataset.testHelper.ts @@ -1,8 +1,10 @@ -import { namedNode, literal, quad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { BaseQuad, Dataset, DatasetFactory, Quad } from "@rdfjs/types"; import type { SubjectNode, ObjectNode, PredicateNode } from "@ldo/rdf-utils"; import { Readable } from "stream"; +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 9e28b8a..03bd64a 100644 --- a/packages/jsonld-dataset-proxy/README.md +++ b/packages/jsonld-dataset-proxy/README.md @@ -50,7 +50,8 @@ npm install @ldo/jsonld-dataset-proxy import jsonldDatasetProxy, { write, LdSet } from "jsonld-dataset-proxy"; import { ContextDefinition } from "jsonld"; import { serializedToDataset } from "@ldo/dataset"; -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from '@rdfjs/data-model'; +const { namedNode } = rdfdm; async function start() { // Define initial data diff --git a/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts b/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts index 6e5d826..7d4e615 100644 --- a/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts +++ b/packages/jsonld-dataset-proxy/src/JsonldDatasetProxyBuilder.ts @@ -1,4 +1,4 @@ -import { blankNode, namedNode } from "@rdfjs/data-model"; +import * as rdfdm 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.js"; @@ -6,6 +6,8 @@ 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 9b92d6a..f57dfcb 100644 --- a/packages/jsonld-dataset-proxy/src/ProxyContext.ts +++ b/packages/jsonld-dataset-proxy/src/ProxyContext.ts @@ -5,10 +5,12 @@ 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 { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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 e8ee93e..b6d1ee8 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 "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import { getSubjectProxyFromObject } from "./subjectProxy/isSubjectProxy.js"; import type { ObjectLike } from "./types.js"; import { @@ -11,6 +11,8 @@ 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 85e92f0..ff3b9cc 100644 --- a/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts +++ b/packages/jsonld-dataset-proxy/src/jsonldDatasetProxy.ts @@ -1,4 +1,4 @@ -import { defaultGraph } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { Dataset } from "@rdfjs/types"; import type { ContextDefinition } from "jsonld"; import { ContextUtil } from "./ContextUtil.js"; @@ -6,6 +6,8 @@ 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 7a524da..06e94ba 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 "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { ProxyContext } from "../ProxyContext.js"; import { languageKeyToLiteralLanguage, @@ -9,6 +9,8 @@ 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 9364cf1..85bbf1a 100644 --- a/packages/jsonld-dataset-proxy/src/language/languageSet.ts +++ b/packages/jsonld-dataset-proxy/src/language/languageSet.ts @@ -1,4 +1,4 @@ -import { literal, quad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { PredicateNode, SubjectNode } from "@ldo/rdf-utils"; import type { Dataset, Literal } from "@rdfjs/types"; import type { LanguageKey } from "./languageTypes.js"; @@ -6,6 +6,8 @@ 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 8136d83..42c5252 100644 --- a/packages/jsonld-dataset-proxy/src/language/languagesOf.ts +++ b/packages/jsonld-dataset-proxy/src/language/languagesOf.ts @@ -1,10 +1,12 @@ -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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 b404667..1b5743c 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 { defaultGraph, quad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import { createTransactionDatasetFactory, TransactionDataset, @@ -17,6 +17,8 @@ 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 6944044..d8e608c 100644 --- a/packages/jsonld-dataset-proxy/src/setProxy/ldSet/BasicLdSet.ts +++ b/packages/jsonld-dataset-proxy/src/setProxy/ldSet/BasicLdSet.ts @@ -2,7 +2,9 @@ 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 { blankNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; + +const { blankNode } = rdfdm; /* 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 1f08bb8..2bbbbf8 100644 --- a/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts +++ b/packages/jsonld-dataset-proxy/src/subjectProxy/createSubjectHandler.ts @@ -1,4 +1,4 @@ -import { blankNode, namedNode, quad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { BlankNode, NamedNode } from "@rdfjs/types"; import { addObjectToDataset } from "../util/addObjectToDataset.js"; import { deleteValueFromDataset } from "./deleteFromDataset.js"; @@ -11,6 +11,7 @@ import { 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 53e7c88..525e0ad 100644 --- a/packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts +++ b/packages/jsonld-dataset-proxy/src/subjectProxy/getValueForKey.ts @@ -1,11 +1,13 @@ import type { SubjectProxyTarget } from "./createSubjectHandler.js"; -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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 fd3e842..4d017b6 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 { literal, namedNode, quad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import { _getUnderlyingNode } from "../types.js"; import type { SubjectProxy } from "../subjectProxy/SubjectProxy.js"; import { getNodeFromRawObject, getNodeFromRawValue } from "./getNodeFromRaw.js"; @@ -14,6 +14,8 @@ 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 5ea66ea..473bf43 100644 --- a/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts +++ b/packages/jsonld-dataset-proxy/src/util/getNodeFromRaw.ts @@ -1,10 +1,12 @@ import type { BlankNode, Literal, NamedNode } from "@rdfjs/types"; -import { namedNode, literal, blankNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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 49cee5c..53bd327 100644 --- a/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts +++ b/packages/jsonld-dataset-proxy/test/BasicLdSet.test.ts @@ -1,7 +1,12 @@ -import { namedNode } from "@rdfjs/data-model"; -import jsonldDatasetProxy, { BasicLdSet, _getUnderlyingNode } from "../src/index.js"; +import * as rdfdm from "@rdfjs/data-model"; +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 eedf26e..3561be8 100644 --- a/packages/jsonld-dataset-proxy/test/ContextUtil.test.ts +++ b/packages/jsonld-dataset-proxy/test/ContextUtil.test.ts @@ -1,7 +1,9 @@ -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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/nodeToJsonRepresentation.test.ts b/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts index d43a0a0..487ae68 100644 --- a/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts +++ b/packages/jsonld-dataset-proxy/test/nodeToJsonRepresentation.test.ts @@ -1,9 +1,11 @@ import { createDataset } from "@ldo/dataset"; import { ContextUtil } from "../src/ContextUtil.js"; import { nodeToJsonldRepresentation } from "../src/util/nodeToJsonldRepresentation.js"; -import { literal, defaultGraph } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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 e09cea2..31dcf52 100644 --- a/packages/jsonld-dataset-proxy/test/nodeToString.test.ts +++ b/packages/jsonld-dataset-proxy/test/nodeToString.test.ts @@ -1,6 +1,8 @@ -import { blankNode, defaultGraph, literal, namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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/src/util.ts b/packages/ldo/src/util.ts index 8dfa3cb..cea7a29 100644 --- a/packages/ldo/src/util.ts +++ b/packages/ldo/src/util.ts @@ -1,4 +1,4 @@ -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { Dataset, Quad } from "@rdfjs/types"; import type { SetProxy, SubjectProxy } from "@ldo/jsonld-dataset-proxy"; import { @@ -12,6 +12,8 @@ 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 16d8011..c3cc194 100644 --- a/packages/ldo/test/LdoDataset.test.ts +++ b/packages/ldo/test/LdoDataset.test.ts @@ -1,4 +1,4 @@ -import { literal, namedNode, quad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import { createDataset } from "@ldo/dataset"; import type { SolidProfileShape } from "./profileData.js"; import { ProfileShapeType } from "./profileData.js"; @@ -14,6 +14,8 @@ 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 9d5ef98..56e4d43 100644 --- a/packages/ldo/test/methods.test.ts +++ b/packages/ldo/test/methods.test.ts @@ -1,4 +1,4 @@ -import { namedNode } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { SubjectProxy } from "@ldo/jsonld-dataset-proxy"; import { getProxyFromObject, @@ -26,6 +26,8 @@ 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/src/datasetChanges.ts b/packages/rdf-utils/src/datasetChanges.ts index bc0383b..38b3198 100644 --- a/packages/rdf-utils/src/datasetChanges.ts +++ b/packages/rdf-utils/src/datasetChanges.ts @@ -1,7 +1,9 @@ import type { BaseQuad, Dataset, Quad } from "@rdfjs/types"; -import { quad as createQuad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import { datasetToString } from "./datasetConverters.js"; +const { quad: createQuad } = rdfdm; + /** * An interface representing the changes made */ diff --git a/packages/solid-type-index/src/setTypeIndex.ts b/packages/solid-type-index/src/setTypeIndex.ts index eecdbdf..4ffddc4 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 { namedNode, quad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { TypeRegistration } from "./.ldo/typeIndex.typings.js"; import { getProfile } from "./getTypeIndex.js"; import { TypeIndexProfileShapeType } from "./.ldo/profile.shapeTypes.js"; @@ -20,6 +20,8 @@ import { TypeRegistrationShapeType, } from "./.ldo/typeIndex.shapeTypes.js"; +const { namedNode, quad } = rdfdm; + /** * ============================================================================= * INITIALIZERS diff --git a/packages/subscribable-dataset/Readme.md b/packages/subscribable-dataset/Readme.md index c01c0c3..a1f98cd 100644 --- a/packages/subscribable-dataset/Readme.md +++ b/packages/subscribable-dataset/Readme.md @@ -12,7 +12,8 @@ npm i @ldo/subscribable-dataset ```typescript import { createSubscribableDataset, DatasetChanges } from "@ldo/subscribable-dataset"; import { Dataset } from "@rdfjs/types"; -import { quad, namedNode, literal } from "@rdfjs/data-model"; +import * as rdfdm from '@rdfjs/data-model'; +const { quad, namedNode } = rdfdm; const subscribableDataset = createSubscribableDataset([ quad( @@ -99,8 +100,9 @@ run(); ```typescript import { createSubscribableDataset, DatasetChanges } from "@ldo/subscribable-dataset"; -import { quad, namedNode, literal } from "@rdfjs/data-model"; +import * as rdfdm from '@rdfjs/data-model'; 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 17c7307..6e0b4b3 100644 --- a/packages/subscribable-dataset/example/subscribableDatasetExample.ts +++ b/packages/subscribable-dataset/example/subscribableDatasetExample.ts @@ -1,7 +1,9 @@ import { createSubscribableDataset } from "../src/index.js"; -import { quad, namedNode, literal } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; 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/test/TransactionalDataset.test.ts b/packages/subscribable-dataset/test/TransactionalDataset.test.ts index e430c8b..a02d22c 100644 --- a/packages/subscribable-dataset/test/TransactionalDataset.test.ts +++ b/packages/subscribable-dataset/test/TransactionalDataset.test.ts @@ -1,4 +1,4 @@ -import { namedNode, literal, quad } from "@rdfjs/data-model"; +import * as rdfdm from "@rdfjs/data-model"; import type { Dataset, DatasetCoreFactory, @@ -14,6 +14,8 @@ import { } from "../src/index.js"; import datasetCoreFactory from "@rdfjs/dataset"; +const { quad, namedNode, literal } = rdfdm; + describe("TransactionDataset", () => { let parentDataset: ISubscribableDataset; let transactionalDataset: TransactionDataset;