Fix dataset wrappers

Author: matthieubosquet

src/dataset/AcrDataset.ts

@@ -1,18 +1,20 @@
 import { DatasetWrapper } from "rdfjs-wrapper"
-import { AccessControlResource } from "../class/AccessControlResource.js";
+import { AccessControlResource } from "../class/acp/AccessControlResource.js";
 import { ACP } from "../vocabulary/acp.js";
 
 export class AcrDataset extends DatasetWrapper {
     get acr(): AccessControlResource | undefined {
         const subjects = new Set([
-            ...this.instancesOf(AccessControlResource, ACP.AccessControlResource),
-            ...this.subjectsOf(AccessControlResource, ACP.resource),
-            ...this.subjectsOf(AccessControlResource, ACP.accessControl),
-            ...this.subjectsOf(AccessControlResource, ACP.memberAccessControl)
+            ...this.instancesOf(ACP.AccessControlResource, AccessControlResource),
+            ...this.subjectsOf(ACP.resource, AccessControlResource),
+            ...this.subjectsOf(ACP.accessControl, AccessControlResource),
+            ...this.subjectsOf(ACP.memberAccessControl, AccessControlResource)
         ])
 
         for (const subject of subjects) {
             return subject
         }
+
+        return
     }
 }

src/dataset/ContainerDataset.ts

@@ -6,8 +6,10 @@ export class ContainerDataset extends DatasetWrapper {
     // TODO: Consider that this might be undefined if there are no contained resources. We might need different matching.
     get container(): Container | undefined {
         // Return the first container in the dataset
-        for (const s of this.subjectsOf(Container, LDP.contains)) {
-            return s;
+        for (const s of this.subjectsOf(LDP.contains, Container)) {
+            return s
         }
+
+        return
     }
 }

src/dataset/WebIdDataset.ts

@@ -7,8 +7,10 @@ export class WebIdDataset extends DatasetWrapper{
         // TODO: Fix with FOAF: Primary topic either via Inrupt or spec because this does not work with Inrupt WebID
         // TODO: do the isPrimaryTopicOf route and the primaryTopic (maybe)
         // Or not because all WebIDs will have an issuer (otherwise also needs to restrict to the document URL as subject or object to realise the benefit)
-        for (const s of this.subjectsOf(Agent., SOLID.oidcIssuer)) {
-            return s;
+        for (const s of this.subjectsOf(SOLID.oidcIssuer, Agent)) {
+            return s
         }
+
+        return
     }
 }