Replace deprecated rdfjs-wrapper with @rdfjs/wrapper

package.json

@@ -37,7 +37,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "rdfjs-wrapper": "^0.15.0"
+    "@rdfjs/wrapper": "^0.32.0"
   },
   "devDependencies": {
     "@rdfjs/types": "^2",

src/acp/AccessControl.ts

@@ -1,10 +1,10 @@
-import { TermWrapper } from "rdfjs-wrapper"
+import { TermAs, TermFrom } from "@rdfjs/wrapper"
 import { Policy } from "./Policy.js"
 import { ACP } from "../vocabulary/mod.js"
 import { Typed } from "./Typed.js";
 
 export class AccessControl extends Typed {
     get apply(): Set<Policy> {
-        return this.objects(ACP.apply, TermWrapper.as(Policy), TermWrapper.as(Policy))
+        return this.objects(ACP.apply, TermAs.instance(Policy), TermFrom.instance)
     }
 }

src/acp/AccessControlResource.ts

@@ -1,18 +1,18 @@
-import { ValueMappings, TermMappings, TermWrapper } from "rdfjs-wrapper"
+import { NamedNodeAs, NamedNodeFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
 import { AccessControl } from "./AccessControl.js"
 import { ACP } from "../vocabulary/mod.js"
 import { Typed } from "./Typed.js";
 
 export class AccessControlResource extends Typed {
     get accessControl(): Set<AccessControl> {
-        return this.objects(ACP.accessControl, TermWrapper.as(AccessControl), TermWrapper.as(AccessControl))
+        return this.objects(ACP.accessControl, TermAs.instance(AccessControl), TermFrom.instance)
     }
 
     get resource(): string | undefined {
-        return this.singularNullable(ACP.resource, ValueMappings.iriToString)
+        return this.singularNullable(ACP.resource, NamedNodeAs.string)
     }
 
     set resource(v: string) {
-        this.overwriteNullable(ACP.resource, v, TermMappings.stringToIri)
+        this.overwriteNullable(ACP.resource, v, NamedNodeFrom.string)
     }
 }

src/acp/AcrDataset.ts

@@ -1,4 +1,4 @@
-import { DatasetWrapper } from "rdfjs-wrapper"
+import { DatasetWrapper } from "@rdfjs/wrapper"
 import { AccessControlResource } from "./AccessControlResource.js";
 import { ACP } from "../vocabulary/mod.js";
 

src/acp/Matcher.ts

@@ -1,9 +1,9 @@
-import { TermMappings, ValueMappings } from "rdfjs-wrapper"
+import { NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"
 import { ACP } from "../vocabulary/mod.js"
 import { Typed } from "./Typed.js";
 
 export class Matcher extends Typed {
     get agent(): Set<string> {
-        return this.objects(ACP.agent, ValueMappings.iriToString, TermMappings.stringToIri)
+        return this.objects(ACP.agent, NamedNodeAs.string, NamedNodeFrom.string)
     }
 }

src/acp/Policy.ts

@@ -1,14 +1,14 @@
-import { TermMappings, ValueMappings, TermWrapper } from "rdfjs-wrapper"
+import { NamedNodeAs, NamedNodeFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
 import { Matcher } from "./Matcher.js"
 import { ACP } from "../vocabulary/mod.js"
 import { Typed } from "./Typed.js";
 
 export class Policy extends Typed {
     get allow(): Set<string> {
-        return this.objects(ACP.allow, ValueMappings.iriToString, TermMappings.stringToIri)
+        return this.objects(ACP.allow, NamedNodeAs.string, NamedNodeFrom.string)
     }
 
     get anyOf(): Set<Matcher> {
-        return this.objects(ACP.anyOf, TermWrapper.as(Matcher), TermWrapper.as(Matcher))
+        return this.objects(ACP.anyOf, TermAs.instance(Matcher), TermFrom.instance)
     }
 }

src/acp/Typed.ts

@@ -1,8 +1,8 @@
-import { TermMappings, ValueMappings, TermWrapper } from "rdfjs-wrapper"
+import { TermWrapper, NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"
 import { RDF } from "../vocabulary/mod.js"
 
 export class Typed extends TermWrapper {
     get type(): Set<string> {
-        return this.objects(RDF.type, ValueMappings.iriToString, TermMappings.stringToIri)
+        return this.objects(RDF.type, NamedNodeAs.string, NamedNodeFrom.string)
     }
 }

src/solid/Container.ts

@@ -1,9 +1,9 @@
-import { TermWrapper } from "rdfjs-wrapper"
+import { TermAs, TermFrom } from "@rdfjs/wrapper"
 import { Resource } from "./Resource.js"
 import { LDP } from "../vocabulary/mod.js"
 
 export class Container extends Resource {
     public get contains(): Set<Resource> {
-        return this.objects(LDP.contains, TermWrapper.as(Resource), TermWrapper.as(Resource))
+        return this.objects(LDP.contains, TermAs.instance(Resource), TermFrom.instance)
     }
 }

src/solid/ContainerDataset.ts

@@ -1,4 +1,4 @@
-import { DatasetWrapper } from "rdfjs-wrapper"
+import { DatasetWrapper } from "@rdfjs/wrapper"
 import { Container } from "./Container.js"
 import { LDP } from "../vocabulary/mod.js"
 

src/solid/Email.ts

@@ -1,20 +1,20 @@
-import { TermWrapper, ValueMappings, TermMappings } from 'rdfjs-wrapper';
+import { TermWrapper, LiteralAs, LiteralFrom, NamedNodeAs, NamedNodeFrom } from '@rdfjs/wrapper';
 import { VCARD, RDF } from '../vocabulary/mod.js';
 
 export class Email extends TermWrapper {
   get emailAddress(): string {
-    return this.singular(VCARD.value, ValueMappings.literalToString);
+    return this.singular(VCARD.value, LiteralAs.string);
   }
 
   set emailAddress(value: string) {
-    this.overwrite(VCARD.value, value, TermMappings.stringToLiteral);
+    this.overwrite(VCARD.value, value, LiteralFrom.string);
   }
 
   get emailType(): string | undefined {
-    return this.singularNullable(RDF.type, ValueMappings.iriToString);
+    return this.singularNullable(RDF.type, NamedNodeAs.string);
   }
 
   set emailType(value: string | undefined) {
-    this.overwriteNullable(RDF.type, value, TermMappings.stringToIri);
+    this.overwriteNullable(RDF.type, value, NamedNodeFrom.string);
   }
 }

src/solid/EmailDataset.ts

@@ -1,4 +1,4 @@
-import { DatasetWrapper } from 'rdfjs-wrapper';
+import { DatasetWrapper } from '@rdfjs/wrapper';
 import { VCARD } from '../vocabulary/mod.js';
 import { Email } from './Email.js';
 

src/solid/Resource.ts

@@ -1,4 +1,4 @@
-import { TermMappings, ValueMappings, TermWrapper } from "rdfjs-wrapper"
+import { TermWrapper, LiteralAs, NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"
 import { DC, POSIX, RDF, RDFS } from "../vocabulary/mod.js"
 
 // TODO: review implementation of this
@@ -8,7 +8,7 @@ export class Resource extends TermWrapper {
     #ianaMediaTypePattern = /^http:\/\/www\.w3\.org\/ns\/iana\/media-types\/(.+)#Resource$/;
 
     get id(): string {
-        return this.term.value
+        return this.value
     }
 
     get isContainer(): boolean {
@@ -20,35 +20,35 @@ export class Resource extends TermWrapper {
     }
 
     get title(): string | undefined {
-        return this.singularNullable(DC.title, ValueMappings.literalToString)
+        return this.singularNullable(DC.title, LiteralAs.string)
     }
 
     get label(): string | undefined {
-        return this.singularNullable(RDFS.label, ValueMappings.literalToString)
+        return this.singularNullable(RDFS.label, LiteralAs.string)
     }
 
     get name(): string {
         return this.title ?? this.label ?? this.extractNameFromUrl(this.id)
     }
 
     get modified(): Date | undefined {
-        return this.singularNullable(DC.modified, ValueMappings.literalToDate)
+        return this.singularNullable(DC.modified, LiteralAs.date)
     }
 
     get mtime(): Date | undefined {
-        return this.singularNullable(POSIX.mtime, ValueMappings.literalToDate)
+        return this.singularNullable(POSIX.mtime, LiteralAs.date)
     }
 
     get lastModified(): Date | undefined {
         return this.modified ?? this.mtime
     }
 
     get size(): number | undefined {
-        return this.singularNullable(POSIX.size, ValueMappings.literalToNumber)
+        return this.singularNullable(POSIX.size, LiteralAs.number)
     }
 
     get type(): Set<string> {
-        return this.objects(RDF.type, ValueMappings.iriToString, TermMappings.stringToIri)
+        return this.objects(RDF.type, NamedNodeAs.string, NamedNodeFrom.string)
     }
 
     get mimeType(): string | undefined {

src/solid/Telephone.ts

@@ -1,20 +1,20 @@
-import { TermWrapper, ValueMappings, TermMappings } from 'rdfjs-wrapper';
+import { TermWrapper, LiteralAs, LiteralFrom, NamedNodeAs, NamedNodeFrom } from '@rdfjs/wrapper';
 import { VCARD } from '../vocabulary/mod.js';
 
 export class Telephone extends TermWrapper {
   get phoneNumber(): string {
-    return this.singular(VCARD.hasValue, ValueMappings.literalToString);
+    return this.singular(VCARD.hasValue, LiteralAs.string);
   }
 
   set phoneNumber(value: string) {
-    this.overwrite(VCARD.hasValue, value, TermMappings.stringToLiteral);
+    this.overwrite(VCARD.hasValue, value, LiteralFrom.string);
   }
 
   get phoneType(): string | undefined {
-    return this.singularNullable(VCARD.telephoneType, ValueMappings.iriToString);
+    return this.singularNullable(VCARD.telephoneType, NamedNodeAs.string);
   }
 
   set phoneType(value: string | undefined) {
-    this.overwriteNullable(VCARD.telephoneType, value, TermMappings.stringToIri);
+    this.overwriteNullable(VCARD.telephoneType, value, NamedNodeFrom.string);
   }
 }

src/solid/TelephoneDataset.ts

@@ -1,4 +1,4 @@
-import { DatasetWrapper } from 'rdfjs-wrapper';
+import { DatasetWrapper } from '@rdfjs/wrapper';
 import { VCARD } from '../vocabulary/vcard.js';
 import { Telephone } from './Telephone.js';
 

src/webid/Agent.ts

@@ -1,41 +1,41 @@
-import { TermMappings, ValueMappings, TermWrapper } from "rdfjs-wrapper"
+import { TermWrapper, LiteralAs, NamedNodeAs, NamedNodeFrom, TermAs } from "@rdfjs/wrapper"
 import { FOAF, PIM, SOLID, VCARD } from "../vocabulary/mod.js"
 
 export class Agent extends TermWrapper {
     get vcardFn(): string | undefined {
-        return this.singularNullable(VCARD.fn, ValueMappings.literalToString)
+        return this.singularNullable(VCARD.fn, LiteralAs.string)
     }
 
     get vcardHasUrl(): string | undefined {
-        return this.singularNullable(VCARD.hasUrl, ValueMappings.iriToString)
+        return this.singularNullable(VCARD.hasUrl, NamedNodeAs.string)
     }
 
     get organization(): string | null {
-        return this.singularNullable(VCARD.organizationName, ValueMappings.iriToString) ?? null
+        return this.singularNullable(VCARD.organizationName, NamedNodeAs.string) ?? null
     }
 
     get role(): string | null {
-        return this.singularNullable(VCARD.role, ValueMappings.iriToString) ?? null
+        return this.singularNullable(VCARD.role, NamedNodeAs.string) ?? null
     }
 
     get title(): string | null {
-        return this.singularNullable(VCARD.title, ValueMappings.literalToString) ?? null
+        return this.singularNullable(VCARD.title, LiteralAs.string) ?? null
     }
 
     get phone(): string | null {
         return this.hasTelephone?.value ?? null
     }
 
     get hasTelephone(): HasValue | undefined {
-        return this.singularNullable(VCARD.hasTelephone, TermWrapper.as(HasValue))
+        return this.singularNullable(VCARD.hasTelephone, TermAs.instance(HasValue))
     }
 
     get foafName(): string | undefined {
-        return this.singularNullable(FOAF.name, ValueMappings.literalToString)
+        return this.singularNullable(FOAF.name, LiteralAs.string)
     }
 
     get name(): string | null {
-        return this.vcardFn ?? this.foafName ?? this.term.value.split("/").pop()?.split("#")[0] ?? null
+        return this.vcardFn ?? this.foafName ?? this.value.split("/").pop()?.split("#")[0] ?? null
     }
 
     get storageUrls(): Set<string> {
@@ -44,44 +44,44 @@ export class Agent extends TermWrapper {
     }
 
     get foafHomepage(): string | undefined {
-        return this.singularNullable(FOAF.homepage, ValueMappings.literalToString)
+        return this.singularNullable(FOAF.homepage, LiteralAs.string)
     }
 
     get website(): string | null {
         return this.vcardHasUrl ?? this.foafHomepage ?? null
     }
 
     get photoUrl(): string | null {
-        return this.singularNullable(VCARD.hasPhoto, ValueMappings.literalToString) ?? null
+        return this.singularNullable(VCARD.hasPhoto, LiteralAs.string) ?? null
     }
 
     get pimStorage(): Set<string> {
-        return this.objects(PIM.storage, ValueMappings.iriToString, TermMappings.stringToIri)
+        return this.objects(PIM.storage, NamedNodeAs.string, NamedNodeFrom.string)
     }
 
     get solidStorage(): Set<string> {
-        return this.objects(SOLID.storage, ValueMappings.iriToString, TermMappings.stringToIri)
+        return this.objects(SOLID.storage, NamedNodeAs.string, NamedNodeFrom.string)
     }
 
     get email(): string | null {
         return this.hasEmail?.value ?? null
     }
 
     get hasEmail(): HasValue | undefined {
-        return this.singularNullable(VCARD.hasEmail, TermWrapper.as(HasValue))
+        return this.singularNullable(VCARD.hasEmail, TermAs.instance(HasValue))
     }
 
     get knows(): Set<string> {
-        return this.objects(FOAF.knows, ValueMappings.iriToString, TermMappings.stringToIri)
+        return this.objects(FOAF.knows, NamedNodeAs.string, NamedNodeFrom.string)
     }
 }
 
 class HasValue extends TermWrapper {
-    get value(): string {
-        return this.hasValue ?? this.term.value
+    override get value(): string {
+        return this.hasValue ?? super.value
     }
 
     get hasValue(): string | undefined {
-        return this.singularNullable(VCARD.hasValue, ValueMappings.iriToString)
+        return this.singularNullable(VCARD.hasValue, NamedNodeAs.string)
     }
 }

src/webid/WebIdDataset.ts

@@ -1,4 +1,4 @@
-import { DatasetWrapper } from "rdfjs-wrapper"
+import { DatasetWrapper } from "@rdfjs/wrapper"
 import { Agent } from "../webid/Agent.js"
 import { SOLID } from "../vocabulary/mod.js"
 

test/unit/example.test.ts

@@ -24,7 +24,7 @@ describe("Example suite", async () => {
         store.addQuads(new Parser().parse(rdf));
         const webid = new WebIdDataset(store, DataFactory)
 
-        assert.equal("https://id.inrupt.com/matthieuodi", webid.mainSubject?.term.value)
+        assert.equal("https://id.inrupt.com/matthieuodi", webid.mainSubject?.value)
         assert.equal("Matthieu Odi", webid.mainSubject?.name)
     })
 })