Improve ACP mapping

Author: langsamu

src/acp/AccessControlResource.ts

@@ -8,11 +8,15 @@ export class AccessControlResource extends Typed {
         return SetFrom.subjectPredicate(this, ACP.accessControl, TermAs.instance(AccessControl), TermFrom.instance)
     }
 
+    get memberAccessControl(): Set<AccessControl> {
+        return SetFrom.subjectPredicate(this, ACP.memberAccessControl, TermAs.instance(AccessControl), TermFrom.instance)
+    }
+
     get resource(): string | undefined {
         return OptionalFrom.subjectPredicate(this, ACP.resource, NamedNodeAs.string)
     }
 
-    set resource(v: string) {
+    set resource(v: string | undefined) {
         OptionalAs.object(this, ACP.resource, v, NamedNodeFrom.string)
     }
 }

src/acp/Matcher.ts

@@ -6,4 +6,16 @@ export class Matcher extends Typed {
     get agent(): Set<string> {
         return SetFrom.subjectPredicate(this, ACP.agent, NamedNodeAs.string, NamedNodeFrom.string)
     }
+
+    get client(): Set<string> {
+        return SetFrom.subjectPredicate(this, ACP.client, NamedNodeAs.string, NamedNodeFrom.string)
+    }
+
+    get issuer(): Set<string> {
+        return SetFrom.subjectPredicate(this, ACP.issuer, NamedNodeAs.string, NamedNodeFrom.string)
+    }
+
+    get vc(): Set<string> {
+        return SetFrom.subjectPredicate(this, ACP.vc, NamedNodeAs.string, NamedNodeFrom.string)
+    }
 }

src/acp/Policy.ts

@@ -8,7 +8,19 @@ export class Policy extends Typed {
         return SetFrom.subjectPredicate(this, ACP.allow, NamedNodeAs.string, NamedNodeFrom.string)
     }
 
+    get deny(): Set<string> {
+        return SetFrom.subjectPredicate(this, ACP.deny, NamedNodeAs.string, NamedNodeFrom.string)
+    }
+
     get anyOf(): Set<Matcher> {
         return SetFrom.subjectPredicate(this, ACP.anyOf, TermAs.instance(Matcher), TermFrom.instance)
     }
+
+    get allOf(): Set<Matcher> {
+        return SetFrom.subjectPredicate(this, ACP.allOf, TermAs.instance(Matcher), TermFrom.instance)
+    }
+
+    get noneOf(): Set<Matcher> {
+        return SetFrom.subjectPredicate(this, ACP.noneOf, TermAs.instance(Matcher), TermFrom.instance)
+    }
 }

src/vocabulary/acp.ts

@@ -5,8 +5,14 @@ export const ACP = {
   Policy: "http://www.w3.org/ns/solid/acp#Policy",
   accessControl: "http://www.w3.org/ns/solid/acp#accessControl",
   agent: "http://www.w3.org/ns/solid/acp#agent",
+  client: "http://www.w3.org/ns/solid/acp#client",
+  issuer: "http://www.w3.org/ns/solid/acp#issuer",
+  vc: "http://www.w3.org/ns/solid/acp#vc",
   allow: "http://www.w3.org/ns/solid/acp#allow",
+  deny: "http://www.w3.org/ns/solid/acp#deny",
   anyOf: "http://www.w3.org/ns/solid/acp#anyOf",
+  allOf: "http://www.w3.org/ns/solid/acp#allOf",
+  noneOf: "http://www.w3.org/ns/solid/acp#noneOf",
   apply: "http://www.w3.org/ns/solid/acp#apply",
   memberAccessControl: "http://www.w3.org/ns/solid/acp#memberAccessControl",
   mode: "http://www.w3.org/ns/solid/acp#mode",