Bump @rdfjs/wrapper from 0.32.0 to 0.33.0 (#21)

dependabot[bot] · langsamu · web-flow · commit dacbf93ebb4d · 2026-04-11T12:38:42.000+01:00
* Bump @rdfjs/wrapper from 0.32.0 to 0.33.0 Bumps [@rdfjs/wrapper](https://github.com/rdfjs/wrapper) from 0.32.0 to 0.33.0. - [Release notes](https://github.com/rdfjs/wrapper/releases) - [Commits](rdfjs/wrapper@v0.32.0...v.0.33.0) --- updated-dependencies: - dependency-name: "@rdfjs/wrapper" dependency-version: 0.33.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Adjust to breaking API changes --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Samu Lang <langsamu@hotmail.com>
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@rdfjs/wrapper": "^0.32.0"
+    "@rdfjs/wrapper": "^0.33.0"
   },
   "devDependencies": {
     "@rdfjs/types": "^2",
diff --git a/src/acp/AccessControl.ts b/src/acp/AccessControl.ts
@@ -1,10 +1,10 @@
-import { TermAs, TermFrom } from "@rdfjs/wrapper"
+import { SetFrom, 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, TermAs.instance(Policy), TermFrom.instance)
+        return SetFrom.subjectPredicate(this, ACP.apply, TermAs.instance(Policy), TermFrom.instance)
     }
 }
diff --git a/src/acp/AccessControlResource.ts b/src/acp/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 "./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, 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)
     }
 }
diff --git a/src/acp/Matcher.ts b/src/acp/Matcher.ts
@@ -1,9 +1,9 @@
-import { NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"
+import { NamedNodeAs, NamedNodeFrom, SetFrom } 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, NamedNodeAs.string, NamedNodeFrom.string)
+        return SetFrom.subjectPredicate(this, ACP.agent, NamedNodeAs.string, NamedNodeFrom.string)
     }
 }
diff --git a/src/acp/Policy.ts b/src/acp/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 "./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, 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)
     }
 }
diff --git a/src/acp/Typed.ts b/src/acp/Typed.ts
@@ -1,8 +1,8 @@
-import { TermWrapper, NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"
+import { NamedNodeAs, NamedNodeFrom, SetFrom, TermWrapper } from "@rdfjs/wrapper"
 import { RDF } from "../vocabulary/mod.js"
 
 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)
     }
 }
diff --git a/src/solid/Container.ts b/src/solid/Container.ts
@@ -1,9 +1,9 @@
-import { TermAs, TermFrom } from "@rdfjs/wrapper"
+import { SetFrom, 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, TermAs.instance(Resource), TermFrom.instance)
+        return SetFrom.subjectPredicate(this, LDP.contains, TermAs.instance(Resource), TermFrom.instance)
     }
 }
diff --git a/src/solid/Email.ts b/src/solid/Email.ts
@@ -1,20 +1,30 @@
-import { TermWrapper, LiteralAs, LiteralFrom, NamedNodeAs, NamedNodeFrom } from '@rdfjs/wrapper';
-import { VCARD, RDF } from '../vocabulary/mod.js';
+import {
+    LiteralAs,
+    LiteralFrom,
+    NamedNodeAs,
+    NamedNodeFrom,
+    OptionalAs,
+    OptionalFrom,
+    RequiredAs,
+    RequiredFrom,
+    TermWrapper
+} from '@rdfjs/wrapper';
+import { RDF, VCARD } from '../vocabulary/mod.js';
 
 export class Email extends TermWrapper {
   get emailAddress(): string {
-    return this.singular(VCARD.value, LiteralAs.string);
+    return RequiredFrom.subjectPredicate(this, VCARD.value, LiteralAs.string);
   }
 
   set emailAddress(value: string) {
-    this.overwrite(VCARD.value, value, LiteralFrom.string);
+    RequiredAs.object(this, VCARD.value, value, LiteralFrom.string);
   }
 
   get emailType(): string | undefined {
-    return this.singularNullable(RDF.type, NamedNodeAs.string);
+    return OptionalFrom.subjectPredicate(this, RDF.type, NamedNodeAs.string);
   }
 
   set emailType(value: string | undefined) {
-    this.overwriteNullable(RDF.type, value, NamedNodeFrom.string);
+    OptionalAs.object(this, RDF.type, value, NamedNodeFrom.string);
   }
 }
diff --git a/src/solid/Resource.ts b/src/solid/Resource.ts
@@ -1,4 +1,4 @@
-import { TermWrapper, LiteralAs, NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"
+import { LiteralAs, NamedNodeAs, NamedNodeFrom, OptionalFrom, SetFrom, TermWrapper } from "@rdfjs/wrapper"
 import { DC, POSIX, RDF, RDFS } from "../vocabulary/mod.js"
 
 // TODO: review implementation of this
@@ -20,35 +20,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 ?? this.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 {
diff --git a/src/solid/Telephone.ts b/src/solid/Telephone.ts
@@ -1,20 +1,30 @@
-import { TermWrapper, LiteralAs, LiteralFrom, NamedNodeAs, NamedNodeFrom } from '@rdfjs/wrapper';
+import {
+    LiteralAs,
+    LiteralFrom,
+    NamedNodeAs,
+    NamedNodeFrom,
+    OptionalAs,
+    OptionalFrom,
+    RequiredAs,
+    RequiredFrom,
+    TermWrapper
+} from '@rdfjs/wrapper';
 import { VCARD } from '../vocabulary/mod.js';
 
 export class Telephone extends TermWrapper {
   get phoneNumber(): string {
-    return this.singular(VCARD.hasValue, LiteralAs.string);
+    return RequiredFrom.subjectPredicate(this, VCARD.hasValue, LiteralAs.string);
   }
 
   set phoneNumber(value: string) {
-    this.overwrite(VCARD.hasValue, value, LiteralFrom.string);
+    RequiredAs.object(this, VCARD.hasValue, value, LiteralFrom.string);
   }
 
   get phoneType(): string | undefined {
-    return this.singularNullable(VCARD.telephoneType, NamedNodeAs.string);
+    return OptionalFrom.subjectPredicate(this, VCARD.telephoneType, NamedNodeAs.string);
   }
 
   set phoneType(value: string | undefined) {
-    this.overwriteNullable(VCARD.telephoneType, value, NamedNodeFrom.string);
+    OptionalAs.object(this, VCARD.telephoneType, value, NamedNodeFrom.string);
   }
 }
diff --git a/src/webid/Agent.ts b/src/webid/Agent.ts
@@ -1,37 +1,37 @@
-import { TermWrapper, LiteralAs, NamedNodeAs, NamedNodeFrom, TermAs } from "@rdfjs/wrapper"
+import { LiteralAs, NamedNodeAs, NamedNodeFrom, OptionalFrom, SetFrom, TermAs, TermWrapper } 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, 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?.value ?? 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.name, LiteralAs.string)
+        return OptionalFrom.subjectPredicate(this, FOAF.name, 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?.value ?? 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)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`		`-import { TermAs, TermFrom } from "@rdfjs/wrapper"`
	`1`	`+import { SetFrom, TermAs, TermFrom } from "@rdfjs/wrapper"`
`2`	`2`	`import { Policy } from "./Policy.js"`
`3`	`3`	`import { ACP } from "../vocabulary/mod.js"`
`4`	`4`	`import { Typed } from "./Typed.js";`
`5`	`5`
`6`	`6`	`export class AccessControl extends Typed {`
`7`	`7`	`get apply(): Set<Policy> {`
`8`		`- return this.objects(ACP.apply, TermAs.instance(Policy), TermFrom.instance)`
	`8`	`+ return SetFrom.subjectPredicate(this, ACP.apply, TermAs.instance(Policy), TermFrom.instance)`
`9`	`9`	`}`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`		`-import { NamedNodeAs, NamedNodeFrom, TermAs, TermFrom } from "@rdfjs/wrapper"`
	`1`	`+import { NamedNodeAs, NamedNodeFrom, OptionalAs, OptionalFrom, SetFrom, TermAs, TermFrom } from "@rdfjs/wrapper"`
`2`	`2`	`import { AccessControl } from "./AccessControl.js"`
`3`	`3`	`import { ACP } from "../vocabulary/mod.js"`
`4`	`4`	`import { Typed } from "./Typed.js";`
`5`	`5`
`6`	`6`	`export class AccessControlResource extends Typed {`
`7`	`7`	`get accessControl(): Set<AccessControl> {`
`8`		`- return this.objects(ACP.accessControl, TermAs.instance(AccessControl), TermFrom.instance)`
	`8`	`+ return SetFrom.subjectPredicate(this, ACP.accessControl, TermAs.instance(AccessControl), TermFrom.instance)`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`get resource(): string \| undefined {`
`12`		`- return this.singularNullable(ACP.resource, NamedNodeAs.string)`
	`12`	`+ return OptionalFrom.subjectPredicate(this, ACP.resource, NamedNodeAs.string)`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`set resource(v: string) {`
`16`		`- this.overwriteNullable(ACP.resource, v, NamedNodeFrom.string)`
	`16`	`+ OptionalAs.object(this, ACP.resource, v, NamedNodeFrom.string)`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`		`-import { NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"`
	`1`	`+import { NamedNodeAs, NamedNodeFrom, SetFrom } from "@rdfjs/wrapper"`
`2`	`2`	`import { ACP } from "../vocabulary/mod.js"`
`3`	`3`	`import { Typed } from "./Typed.js";`
`4`	`4`
`5`	`5`	`export class Matcher extends Typed {`
`6`	`6`	`get agent(): Set<string> {`
`7`		`- return this.objects(ACP.agent, NamedNodeAs.string, NamedNodeFrom.string)`
	`7`	`+ return SetFrom.subjectPredicate(this, ACP.agent, NamedNodeAs.string, NamedNodeFrom.string)`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`		`-import { NamedNodeAs, NamedNodeFrom, TermAs, TermFrom } from "@rdfjs/wrapper"`
	`1`	`+import { NamedNodeAs, NamedNodeFrom, SetFrom, TermAs, TermFrom } from "@rdfjs/wrapper"`
`2`	`2`	`import { Matcher } from "./Matcher.js"`
`3`	`3`	`import { ACP } from "../vocabulary/mod.js"`
`4`	`4`	`import { Typed } from "./Typed.js";`
`5`	`5`
`6`	`6`	`export class Policy extends Typed {`
`7`	`7`	`get allow(): Set<string> {`
`8`		`- return this.objects(ACP.allow, NamedNodeAs.string, NamedNodeFrom.string)`
	`8`	`+ return SetFrom.subjectPredicate(this, ACP.allow, NamedNodeAs.string, NamedNodeFrom.string)`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`get anyOf(): Set<Matcher> {`
`12`		`- return this.objects(ACP.anyOf, TermAs.instance(Matcher), TermFrom.instance)`
	`12`	`+ return SetFrom.subjectPredicate(this, ACP.anyOf, TermAs.instance(Matcher), TermFrom.instance)`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`		`-import { TermWrapper, NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"`
	`1`	`+import { NamedNodeAs, NamedNodeFrom, SetFrom, TermWrapper } from "@rdfjs/wrapper"`
`2`	`2`	`import { RDF } from "../vocabulary/mod.js"`
`3`	`3`
`4`	`4`	`export class Typed extends TermWrapper {`
`5`	`5`	`get type(): Set<string> {`
`6`		`- return this.objects(RDF.type, NamedNodeAs.string, NamedNodeFrom.string)`
	`6`	`+ return SetFrom.subjectPredicate(this, RDF.type, NamedNodeAs.string, NamedNodeFrom.string)`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { TermWrapper, LiteralAs, NamedNodeAs, NamedNodeFrom } from "@rdfjs/wrapper"`
	`1`	`+import { LiteralAs, NamedNodeAs, NamedNodeFrom, OptionalFrom, SetFrom, TermWrapper } from "@rdfjs/wrapper"`
`2`	`2`	`import { DC, POSIX, RDF, RDFS } from "../vocabulary/mod.js"`
`3`	`3`
`4`	`4`	`// TODO: review implementation of this`
`@@ -20,35 +20,35 @@ export class Resource extends TermWrapper {`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`get title(): string \| undefined {`
`23`		`- return this.singularNullable(DC.title, LiteralAs.string)`
	`23`	`+ return OptionalFrom.subjectPredicate(this, DC.title, LiteralAs.string)`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`get label(): string \| undefined {`
`27`		`- return this.singularNullable(RDFS.label, LiteralAs.string)`
	`27`	`+ return OptionalFrom.subjectPredicate(this, RDFS.label, LiteralAs.string)`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`get name(): string {`
`31`	`31`	`return this.title ?? this.label ?? this.extractNameFromUrl(this.id)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`get modified(): Date \| undefined {`
`35`		`- return this.singularNullable(DC.modified, LiteralAs.date)`
	`35`	`+ return OptionalFrom.subjectPredicate(this, DC.modified, LiteralAs.date)`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`get mtime(): Date \| undefined {`
`39`		`- return this.singularNullable(POSIX.mtime, LiteralAs.date)`
	`39`	`+ return OptionalFrom.subjectPredicate(this, POSIX.mtime, LiteralAs.date)`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`get lastModified(): Date \| undefined {`
`43`	`43`	`return this.modified ?? this.mtime`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`get size(): number \| undefined {`
`47`		`- return this.singularNullable(POSIX.size, LiteralAs.number)`
	`47`	`+ return OptionalFrom.subjectPredicate(this, POSIX.size, LiteralAs.number)`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`get type(): Set<string> {`
`51`		`- return this.objects(RDF.type, NamedNodeAs.string, NamedNodeFrom.string)`
	`51`	`+ return SetFrom.subjectPredicate(this, RDF.type, NamedNodeAs.string, NamedNodeFrom.string)`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`get mimeType(): string \| undefined {`