Updated imports for @rdfjs/data-model

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

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<NextGraphUri>

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 <http://example.org/> .
 @prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .

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

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

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.

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

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

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

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

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

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

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

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

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

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<Quad>,
 ): void {

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

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

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;

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

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
  *

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

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<string> {
   private subject: SubjectNode;
   private predicate: PredicateNode;

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

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,

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<T extends NonNullable<RawValue> = NonNullable<RawValue>>

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

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

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,

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,

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

@@ -1,7 +1,12 @@
-import { namedNode } from "@rdfjs/data-model";
+import * as rdfdm from "@rdfjs/data-model";
-import jsonldDatasetProxy, { BasicLdSet, _getUnderlyingNode } from "../src/index.js";
+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", () => {

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

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(),

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(

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.

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

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;

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

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

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();

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

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<Quad>;
   let transactionalDataset: TransactionDataset<Quad>;