Bump @rdfjs/wrapper to 0.32.0

app/lib/class/AccessControl.ts

@@ -1,10 +1,10 @@
-import { TermAs, TermFrom } from "@rdfjs/wrapper"
+import { SetFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
 import { Policy } from "@/app/lib/class/Policy"
 import { ACP } from "@/app/lib/class/Vocabulary"
 import { Typed } from "@/app/lib/class/Typed";
 
 export class AccessControl extends Typed {
     get apply(): Set<Policy> {
-        return this.objects(ACP.apply, TermAs.instance(Policy), TermFrom.instance)
+        return SetFrom.subjectPredicate(this, ACP.apply, TermAs.instance(Policy), TermFrom.instance)
     }
 }

app/lib/class/AccessControlResource.ts

@@ -1,18 +1,18 @@
-import { NamedNodeAs, NamedNodeFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
+import { NamedNodeAs, NamedNodeFrom, OptionalAs, OptionalFrom, SetFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
 import { AccessControl } from "@/app/lib/class/AccessControl"
 import { ACP } from "@/app/lib/class/Vocabulary"
 import { Typed } from "@/app/lib/class/Typed"
 
 export class AccessControlResource extends Typed {
     get accessControl(): Set<AccessControl> {
-        return this.objects(ACP.accessControl, TermAs.instance(AccessControl), TermFrom.instance)
+        return SetFrom.subjectPredicate(this, ACP.accessControl, TermAs.instance(AccessControl), TermFrom.instance)
     }
 
     get resource(): string | undefined {
-        return this.singularNullable(ACP.resource, NamedNodeAs.string)
+        return OptionalFrom.subjectPredicate(this, ACP.resource, NamedNodeAs.string)
     }
 
     set resource(v: string) {
-        this.overwriteNullable(ACP.resource, v, NamedNodeFrom.string)
+        OptionalAs.object(this, ACP.resource, v, NamedNodeFrom.string)
     }
 }

app/lib/class/Agent.ts

@@ -1,37 +1,37 @@
-import { LiteralAs, NamedNodeAs, NamedNodeFrom, TermAs, TermWrapper } from "@rdfjs/wrapper"
+import { LiteralAs, NamedNodeAs, NamedNodeFrom, OptionalFrom, SetFrom, TermAs, TermWrapper } from "@rdfjs/wrapper"
 import { FOAF, PIM, SOLID, VCARD } from "@/app/lib/class/Vocabulary"
 
 export class Agent extends TermWrapper {
     get vcardFn(): string | undefined {
-        return this.singularNullable(VCARD.fn, LiteralAs.string)
+        return OptionalFrom.subjectPredicate(this, VCARD.fn, LiteralAs.string)
     }
 
     get vcardHasUrl(): string | undefined {
-        return this.singularNullable(VCARD.hasUrl, NamedNodeAs.string)
+        return OptionalFrom.subjectPredicate(this, VCARD.hasUrl, NamedNodeAs.string)
     }
 
     get organization(): string | null {
-        return this.singularNullable(VCARD.organizationName, NamedNodeAs.string) ?? null
+        return OptionalFrom.subjectPredicate(this, VCARD.organizationName, NamedNodeAs.string) ?? null
     }
 
     get role(): string | null {
-        return this.singularNullable(VCARD.role, NamedNodeAs.string) ?? null
+        return OptionalFrom.subjectPredicate(this, VCARD.role, NamedNodeAs.string) ?? null
     }
 
     get title(): string | null {
-        return this.singularNullable(VCARD.title, LiteralAs.string) ?? null
+        return OptionalFrom.subjectPredicate(this, VCARD.title, LiteralAs.string) ?? null
     }
 
     get phone(): string | null {
         return this.hasTelephone?.actualValue ?? null
     }
 
     get hasTelephone(): HasValue | undefined {
-        return this.singularNullable(VCARD.hasTelephone, TermAs.instance(HasValue))
+        return OptionalFrom.subjectPredicate(this, VCARD.hasTelephone, TermAs.instance(HasValue))
     }
 
     get foafName(): string | undefined {
-        return this.singularNullable(FOAF.fname, LiteralAs.string)
+        return OptionalFrom.subjectPredicate(this, FOAF.fname, LiteralAs.string)
     }
 
     get name(): string | null {
@@ -44,35 +44,35 @@ export class Agent extends TermWrapper {
     }
 
     get foafHomepage(): string | undefined {
-        return this.singularNullable(FOAF.homepage, LiteralAs.string)
+        return OptionalFrom.subjectPredicate(this, FOAF.homepage, LiteralAs.string)
     }
 
     get website(): string | null {
         return this.vcardHasUrl ?? this.foafHomepage ?? null
     }
 
     get photoUrl(): string | null {
-        return this.singularNullable(VCARD.hasPhoto, LiteralAs.string) ?? null
+        return OptionalFrom.subjectPredicate(this, VCARD.hasPhoto, LiteralAs.string) ?? null
     }
 
     get pimStorage(): Set<string> {
-        return this.objects(PIM.storage, NamedNodeAs.string, NamedNodeFrom.string)
+        return SetFrom.subjectPredicate(this, PIM.storage, NamedNodeAs.string, NamedNodeFrom.string)
     }
 
     get solidStorage(): Set<string> {
-        return this.objects(SOLID.storage, NamedNodeAs.string, NamedNodeFrom.string)
+        return SetFrom.subjectPredicate(this, SOLID.storage, NamedNodeAs.string, NamedNodeFrom.string)
     }
 
     get email(): string | null {
         return this.hasEmail?.actualValue ?? null
     }
 
     get hasEmail(): HasValue | undefined {
-        return this.singularNullable(VCARD.hasEmail, TermAs.instance(HasValue))
+        return OptionalFrom.subjectPredicate(this, VCARD.hasEmail, TermAs.instance(HasValue))
     }
 
     get knows(): Set<string> {
-        return this.objects(FOAF.knows, NamedNodeAs.string, NamedNodeFrom.string)
+        return SetFrom.subjectPredicate(this, FOAF.knows, NamedNodeAs.string, NamedNodeFrom.string)
     }
 }
 
@@ -82,6 +82,6 @@ class HasValue extends TermWrapper {
     }
 
     get hasValue(): string | undefined {
-        return this.singularNullable(VCARD.hasValue, NamedNodeAs.string)
+        return OptionalFrom.subjectPredicate(this, VCARD.hasValue, NamedNodeAs.string)
     }
 }

app/lib/class/Container.ts

@@ -1,9 +1,9 @@
-import { TermAs, TermFrom } from "@rdfjs/wrapper"
+import { SetFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
 import { Resource } from "@/app/lib/class/Resource"
 import { LDP } from "@/app/lib/class/Vocabulary"
 
 export class Container extends Resource {
     public get contains(): Set<Resource> {
-        return this.objects(LDP.contains, TermAs.instance(Resource), TermFrom.instance)
+        return SetFrom.subjectPredicate(this, LDP.contains, TermAs.instance(Resource), TermFrom.instance)
     }
 }

app/lib/class/Matcher.ts

@@ -1,9 +1,9 @@
-import { NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"
+import { NamedNodeAs, NamedNodeFrom, SetFrom } from "@rdfjs/wrapper"
 import { ACP } from "@/app/lib/class/Vocabulary"
 import { Typed } from "@/app/lib/class/Typed"
 
 export class Matcher extends Typed {
     get agent(): Set<string> {
-        return this.objects(ACP.agent, NamedNodeAs.string, NamedNodeFrom.string)
+        return SetFrom.subjectPredicate(this, ACP.agent, NamedNodeAs.string, NamedNodeFrom.string)
     }
 }

app/lib/class/Policy.ts

@@ -1,14 +1,14 @@
-import { NamedNodeAs, NamedNodeFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
+import { NamedNodeAs, NamedNodeFrom, SetFrom, TermAs, TermFrom } from "@rdfjs/wrapper"
 import { Matcher } from "@/app/lib/class/Matcher"
 import { ACP } from "@/app/lib/class/Vocabulary"
 import { Typed } from "@/app/lib/class/Typed"
 
 export class Policy extends Typed {
     get allow(): Set<string> {
-        return this.objects(ACP.allow, NamedNodeAs.string, NamedNodeFrom.string)
+        return SetFrom.subjectPredicate(this, ACP.allow, NamedNodeAs.string, NamedNodeFrom.string)
     }
 
     get anyOf(): Set<Matcher> {
-        return this.objects(ACP.anyOf, TermAs.instance(Matcher), TermFrom.instance)
+        return SetFrom.subjectPredicate(this, ACP.anyOf, TermAs.instance(Matcher), TermFrom.instance)
     }
 }

app/lib/class/Resource.ts

@@ -1,4 +1,4 @@
-import { LiteralAs, NamedNodeAs, NamedNodeFrom, TermWrapper } from "@rdfjs/wrapper"
+import { LiteralAs, NamedNodeAs, NamedNodeFrom, OptionalFrom, SetFrom, TermWrapper } from "@rdfjs/wrapper"
 import { DC, POSIX, RDF, RDFS } from "@/app/lib/class/Vocabulary"
 import { extractNameFromUrl, FileType } from "@/app/lib/helpers"
 
@@ -18,35 +18,35 @@ export class Resource extends TermWrapper {
     }
 
     get title(): string | undefined {
-        return this.singularNullable(DC.title, LiteralAs.string)
+        return OptionalFrom.subjectPredicate(this, DC.title, LiteralAs.string)
     }
 
     get label(): string | undefined {
-        return this.singularNullable(RDFS.label, LiteralAs.string)
+        return OptionalFrom.subjectPredicate(this, RDFS.label, LiteralAs.string)
     }
 
     get name(): string {
         return this.title ?? this.label ?? extractNameFromUrl(this.id)
     }
 
     get modified(): Date | undefined {
-        return this.singularNullable(DC.modified, LiteralAs.date)
+        return OptionalFrom.subjectPredicate(this, DC.modified, LiteralAs.date)
     }
 
     get mtime(): Date | undefined {
-        return this.singularNullable(POSIX.mtime, LiteralAs.date)
+        return OptionalFrom.subjectPredicate(this, POSIX.mtime, LiteralAs.date)
     }
 
     get lastModified(): Date | undefined {
         return this.modified ?? this.mtime
     }
 
     get size(): number | undefined {
-        return this.singularNullable(POSIX.size, LiteralAs.number)
+        return OptionalFrom.subjectPredicate(this, POSIX.size, LiteralAs.number)
     }
 
     get type(): Set<string> {
-        return this.objects(RDF.type, NamedNodeAs.string, NamedNodeFrom.string)
+        return SetFrom.subjectPredicate(this, RDF.type, NamedNodeAs.string, NamedNodeFrom.string)
     }
 
     get mimeType(): string | undefined {

app/lib/class/Typed.ts

@@ -1,8 +1,8 @@
-import { NamedNodeAs, NamedNodeFrom, TermWrapper } from "@rdfjs/wrapper"
+import { NamedNodeAs, NamedNodeFrom, SetFrom, TermWrapper } from "@rdfjs/wrapper"
 import { RDF } from "@/app/lib/class/Vocabulary"
 
 export class Typed extends TermWrapper {
     get type(): Set<string> {
-        return this.objects(RDF.type, NamedNodeAs.string, NamedNodeFrom.string)
+        return SetFrom.subjectPredicate(this, RDF.type, NamedNodeAs.string, NamedNodeFrom.string)
     }
 }

package.json

@@ -17,7 +17,7 @@
     "@inrupt/solid-client": "^1.23.1",
     "@inrupt/solid-client-authn-browser": "^3.1.1",
     "@ldo/solid-react": "^1.0.0-alpha.33",
-    "@rdfjs/wrapper": "^0.32.0",
+    "@rdfjs/wrapper": "^0.33.0",
     "jszip": "^3.10.1",
     "n3": "^2.0.1",
     "next": "16.0.7",