Adjust to breaking API changes

Author: langsamu

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

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

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

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

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

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

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

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 {

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

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