solid-logic 1.3.17-f7bdc345 → 2.0.0-30dbc72f

package/test/chatLogic.test.ts

@@ -1,34 +1,35 @@
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-import { ChatLogic } from "../src/chat/ChatLogic";
-import solidNamespace from "solid-namespace";
-import * as rdf from "rdflib";
-import { ProfileLogic } from "../src/profile/ProfileLogic";
-import { UpdateManager } from "rdflib";
-import { SolidNamespace } from "../src/types";
+/**
+* @jest-environment jsdom
+*
+*/
+import { UpdateManager, Store, Fetcher } from "rdflib";
+import { createAclLogic } from "../src/acl/aclLogic";
+import { createChatLogic } from '../src/chat/chatLogic';
+import { createProfileLogic } from "../src/profile/profileLogic";
+import { createContainerLogic } from "../src/util/containerLogic";
+import { createUtilityLogic } from "../src/util/utilityLogic";
+import { alice, bob } from "./helpers/dataSetup";
 
-const ns: SolidNamespace = solidNamespace(rdf);
-
-const alice = rdf.sym("https://alice.example/profile/card#me");
-const bob = rdf.sym("https://bob.example/profile/card#me");
+window.$SolidTestEnvironment = { username: alice.uri }
 
 describe("Chat logic", () => {
-  let chat;
+  let chatLogic;
   let store;
   beforeEach(() => {
     fetchMock.resetMocks();
     fetchMock.mockResponse("Not Found", {
       status: 404,
     });
-    store = rdf.graph();
-    store.fetcher = rdf.fetcher(store, { fetch: fetchMock, timeout: 5 });
+    store = new Store()
+    store.fetcher = new Fetcher(store, { fetch: fetch });
     store.updater = new UpdateManager(store);
     const authn = {
       currentUser: () => {
         return alice;
       },
     };
-    const profile = new ProfileLogic(store, ns, authn);
-    chat = new ChatLogic(store, ns, profile);
+    const util = createUtilityLogic(store, createAclLogic(store), createContainerLogic(store))
+    chatLogic = createChatLogic(store, createProfileLogic(store, authn, util))
   });
 
   describe("get chat, without creating", () => {
@@ -37,19 +38,19 @@ describe("Chat logic", () => {
       beforeEach(async () => {
         aliceHasValidProfile();
         noChatWithBobExists();
-        result = await chat.getChat(bob, false);
+        result = await chatLogic.getChat(bob, false);
       });
       it("does not return a chat", async () => {
         expect(result).toBeNull();
       });
       it("loaded the current user profile", () => {
         expect(fetchMock.mock.calls[0][0]).toBe(
-          "https://alice.example/profile/card"
+          "https://alice.example.com/profile/card.ttl"
         );
       });
       it("tried to load the chat document", () => {
         expect(fetchMock.mock.calls[1][0]).toBe(
-          "https://alice.example/IndividualChats/bob.example/index.ttl"
+          "https://alice.example.com/IndividualChats/bob.example.com/index.ttl"
         );
       });
       it("has no additional fetch requests", () => {
@@ -74,23 +75,23 @@ describe("Chat logic", () => {
         chatContainerAclCanBeSet();
         editablePrivateTypeIndexIsFound();
         privateTypeIndexIsUpdated();
-        result = await chat.getChat(bob, true);
+        result = await chatLogic.getChat(bob, true);
       });
-      it("returns the chat URI based on the invitee's WebID", async () => {
+      it("returns the chat URI based on the invitee's WebID", () => {
         expect(result.uri).toBe(
-          "https://alice.example/IndividualChats/bob.example/index.ttl#this"
+          "https://alice.example.com/IndividualChats/bob.example.com/index.ttl#this"
         );
       });
       it("created a chat document", () => {
         const request = getRequestTo(
           "PUT",
-          "https://alice.example/IndividualChats/bob.example/index.ttl"
+          "https://alice.example.com/IndividualChats/bob.example.com/index.ttl"
         );
         expect(request.body).toBe(`@prefix : <#>.
 @prefix dc: <http://purl.org/dc/elements/1.1/>.
 @prefix meeting: <http://www.w3.org/ns/pim/meeting#>.
 @prefix xsd: <http://www.w3.org/2001/XMLSchema#>.
-@prefix c: </profile/card#>.
+@prefix c: </profile/card.ttl#>.
 
 :this
     a meeting:LongChat;
@@ -102,41 +103,42 @@ describe("Chat logic", () => {
       it("allowed Bob to participate in the chat by adding an ACL", () => {
         const request = getRequestTo(
           "PUT",
-          "https://alice.example/IndividualChats/bob.example/.acl"
+          "https://alice.example.com/IndividualChats/bob.example.com/.acl"
         );
         expect(request.body).toBe(`
-@prefix acl: <http://www.w3.org/ns/auth/acl#>.
-<#owner>
-    a acl:Authorization;
-    acl:agent <https://alice.example/profile/card#me>;
-    acl:accessTo <.>;
-    acl:default <.>;
-    acl:mode
-        acl:Read, acl:Write, acl:Control.
-<#invitee>
-    a acl:Authorization;
-    acl:agent <https://bob.example/profile/card#me>;
-    acl:accessTo <.>;
-    acl:default <.>;
-    acl:mode
-        acl:Read, acl:Append.
-`);
+            @prefix acl: <http://www.w3.org/ns/auth/acl#>.
+            <#owner>
+            a acl:Authorization;
+            acl:agent <https://alice.example.com/profile/card.ttl#me>;
+            acl:accessTo <.>;
+            acl:default <.>;
+            acl:mode
+                acl:Read, acl:Write, acl:Control.
+            <#invitee>
+            a acl:Authorization;
+            acl:agent <https://bob.example.com/profile/card.ttl#me>;
+            acl:accessTo <.>;
+            acl:default <.>;
+            acl:mode
+                acl:Read, acl:Append.
+            `);
       });
       it("sent an invitation to invitee inbox", () => {
-        const request = getRequestTo("POST", "https://bob.example/inbox");
+        const request = getRequestTo("POST", "https://bob.example.com/inbox");
         expect(request.body).toContain(`
-<> a <http://www.w3.org/ns/pim/meeting#LongChatInvite> ;
-<http://www.w3.org/1999/02/22-rdf-syntax-ns#seeAlso> <https://alice.example/IndividualChats/bob.example/index.ttl#this> .
-  `);});
+        <> a <http://www.w3.org/ns/pim/meeting#LongChatInvite> ;
+        <http://www.w3.org/1999/02/22-rdf-syntax-ns#seeAlso> <https://alice.example.com/IndividualChats/bob.example.com/index.ttl#this> .
+        `);
+      });
       it("added the new chat to private type index", () => {
         const request = getRequestTo(
           "PATCH",
-          "https://alice.example/settings/privateTypeIndex.ttl"
+          "https://alice.example.com/settings/privateTypeIndex.ttl"
         );
         expect(request.body)
-          .toBe(`INSERT DATA { <https://alice.example/settings/privateTypeIndex.ttl#id1612606272000> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/solid/terms#TypeRegistration> .
-<https://alice.example/settings/privateTypeIndex.ttl#id1612606272000> <http://www.w3.org/ns/solid/terms#forClass> <http://www.w3.org/ns/pim/meeting#LongChat> .
-<https://alice.example/settings/privateTypeIndex.ttl#id1612606272000> <http://www.w3.org/ns/solid/terms#instance> <https://alice.example/IndividualChats/bob.example/index.ttl#this> .
+          .toBe(`INSERT DATA { <https://alice.example.com/settings/privateTypeIndex.ttl#id1612606272000> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/ns/solid/terms#TypeRegistration> .
+<https://alice.example.com/settings/privateTypeIndex.ttl#id1612606272000> <http://www.w3.org/ns/solid/terms#forClass> <http://www.w3.org/ns/pim/meeting#LongChat> .
+<https://alice.example.com/settings/privateTypeIndex.ttl#id1612606272000> <http://www.w3.org/ns/solid/terms#instance> <https://alice.example.com/IndividualChats/bob.example.com/index.ttl#this> .
  }
 `);
       });
@@ -148,13 +150,13 @@ describe("Chat logic", () => {
 
   describe("possible errors", () => {
     it("profile does not link to storage", async () => {
-      fetchMock.mockOnceIf("https://alice.example/profile/card", "<><><>.", {
+      fetchMock.mockOnceIf("https://alice.example.com/profile/card.ttl", "<><><>.", {
         headers: {
           "Content-Type": "text/turtle",
         },
       });
       const expectedError = new Error("User pod root not found!");
-      await expect(chat.getChat(bob, false)).rejects.toEqual(expectedError);
+      await expect(chatLogic.getChat(bob, false)).rejects.toEqual(expectedError);
     });
 
     it("invitee inbox not found", async () => {
@@ -163,19 +165,19 @@ describe("Chat logic", () => {
       chatWithBobCanBeCreated();
       bobDoesNotHaveAnInbox();
       const expectedError = new Error(
-        "Invitee inbox not found! https://bob.example/profile/card#me"
+        "Invitee inbox not found! https://bob.example.com/profile/card.ttl#me"
       );
-      await expect(chat.getChat(bob, true)).rejects.toEqual(expectedError);
+      await expect(chatLogic.getChat(bob, true)).rejects.toEqual(expectedError);
     });
   });
 
   function aliceHasValidProfile() {
     fetchMock.mockOnceIf(
-      "https://alice.example/profile/card",
+      "https://alice.example.com/profile/card.ttl",
       `
-            <https://alice.example/profile/card#me>
-              <http://www.w3.org/ns/pim/space#storage> <https://alice.example/> ;
-              <http://www.w3.org/ns/solid/terms#privateTypeIndex> <https://alice.example/settings/privateTypeIndex.ttl> ;
+            <https://alice.example.com/profile/card.ttl#me>
+              <http://www.w3.org/ns/pim/space#storage> <https://alice.example.com/> ;
+              <http://www.w3.org/ns/solid/terms#privateTypeIndex> <https://alice.example.com/settings/privateTypeIndex.ttl> ;
             .`,
       {
         headers: {
@@ -188,7 +190,7 @@ describe("Chat logic", () => {
   function noChatWithBobExists() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === "https://alice.example/IndividualChats/bob.example/index.ttl" &&
+        url === "https://alice.example.com/IndividualChats/bob.example.com/index.ttl" &&
         method === "GET",
       "Not found",
       {
@@ -200,7 +202,7 @@ describe("Chat logic", () => {
   function chatWithBobCanBeCreated() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === "https://alice.example/IndividualChats/bob.example/index.ttl" &&
+        url === "https://alice.example.com/IndividualChats/bob.example.com/index.ttl" &&
         method === "PUT",
       "Created",
       {
@@ -211,8 +213,8 @@ describe("Chat logic", () => {
 
   function bobHasAnInbox() {
     fetchMock.mockOnceIf(
-      "https://bob.example/profile/card",
-      "<https://bob.example/profile/card#me><http://www.w3.org/ns/ldp#inbox><https://bob.example/inbox>.",
+      "https://bob.example.com/profile/card.ttl",
+      "<https://bob.example.com/profile/card.ttl#me><http://www.w3.org/ns/ldp#inbox><https://bob.example.com/inbox>.",
       {
         headers: { "Content-Type": "text/turtle" },
       }
@@ -220,7 +222,7 @@ describe("Chat logic", () => {
   }
 
   function bobDoesNotHaveAnInbox() {
-    fetchMock.mockOnceIf("https://bob.example/profile/card", "<><><>.", {
+    fetchMock.mockOnceIf("https://bob.example.com/profile/card.ttl", "<><><>.", {
       headers: {
         "Content-Type": "text/turtle",
       },
@@ -230,13 +232,13 @@ describe("Chat logic", () => {
   function invitationCanBeSent() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === "https://bob.example/inbox" && method === "POST",
+        url === "https://bob.example.com/inbox" && method === "POST",
       "Created",
       {
         status: 201,
         headers: {
           location:
-            "https://bob.example/inbox/22373339-6cc0-49fc-b69e-0402edda6e4e.ttl",
+            "https://bob.example.com/inbox/22373339-6cc0-49fc-b69e-0402edda6e4e.ttl",
         },
       }
     );
@@ -245,7 +247,7 @@ describe("Chat logic", () => {
   function chatContainerIsFound() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === "https://alice.example/IndividualChats/bob.example/" &&
+        url === "https://alice.example.com/IndividualChats/bob.example.com/" &&
         method === "GET",
       "<><><>.",
       {
@@ -261,7 +263,7 @@ describe("Chat logic", () => {
   function chatContainerAclCanBeSet() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === "https://alice.example/IndividualChats/bob.example/.acl" &&
+        url === "https://alice.example.com/IndividualChats/bob.example.com/.acl" &&
         method === "PUT",
       "Created",
       {
@@ -273,7 +275,7 @@ describe("Chat logic", () => {
   function editablePrivateTypeIndexIsFound() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === "https://alice.example/settings/privateTypeIndex.ttl" &&
+        url === "https://alice.example.com/settings/privateTypeIndex.ttl" &&
         method === "GET",
       "<><><>.",
       {
@@ -290,7 +292,7 @@ describe("Chat logic", () => {
   function privateTypeIndexIsUpdated() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === "https://alice.example/settings/privateTypeIndex.ttl" &&
+        url === "https://alice.example.com/settings/privateTypeIndex.ttl" &&
         method === "PATCH",
       "OK",
       {
@@ -299,9 +301,6 @@ describe("Chat logic", () => {
     );
   }
 
-  /*
-    
-     */
   function getRequestTo(
     method: "GET" | "PUT" | "POST" | "DELETE" | "PATCH",
     url: string

package/test/container.test.ts

@@ -0,0 +1,56 @@
+/**
+* @jest-environment jsdom
+* 
+*/
+import { UpdateManager, Store, Fetcher } from "rdflib";
+import { createContainerLogic } from "../src/util/containerLogic";
+import { alice } from "./helpers/dataSetup";
+
+window.$SolidTestEnvironment = { username: alice.uri }
+
+describe("Container", () => {
+    let store
+    let containerLogic
+    beforeEach(() => {
+        fetchMock.resetMocks()
+        store = new Store()
+        store.fetcher = new Fetcher(store, { fetch: fetch });
+        store.updater = new UpdateManager(store);
+        containerLogic = createContainerLogic(store)
+    })
+
+    it("getContainerMembers - When container has some containment triples", async () => {
+            containerHasSomeContainmentTriples()
+            const result = await containerLogic.getContainerMembers('https://com/');
+            expect(result.sort()).toEqual([
+                'https://com/foo.txt',
+                'https://com/bar/'
+            ].sort());
+    });
+    it("getContainerMembers- When container is empty - Resolves to an empty array", async () => {
+        containerIsEmpty();
+        const result = await containerLogic.getContainerMembers('https://container.com/');
+        expect(result).toEqual([]);
+    });
+
+    function containerIsEmpty() {
+        fetchMock.mockOnceIf(
+            "https://com/",
+            " ", // FIXME: https://github.com/jefflau/jest-fetch-mock/issues/189
+            {
+                headers: { "Content-Type": "text/turtle" },
+            }
+        );
+    }
+    
+    function containerHasSomeContainmentTriples() {
+        fetchMock.mockOnceIf(
+            "https://com/",
+            "<.> <http://www.w3.org/ns/ldp#contains> <./foo.txt>, <./bar/> .",
+            {
+                headers: { "Content-Type": "text/turtle" },
+            }
+        );
+        
+    }
+})

package/test/helpers/dataSetup.ts

@@ -0,0 +1,134 @@
+import { sym } from 'rdflib'
+import * as rdf from "rdflib";
+import solidNamespace from "solid-namespace";
+import { SolidNamespace } from '../../src/types';
+const ns: SolidNamespace = solidNamespace(rdf);
+
+//------ Club -------------------------------------------------------
+const club = sym('https://club.example.com/profile/card.ttl#it')
+const ClubPreferencesFile = sym('https://club.example.com/settings/prefs.ttl')
+const ClubPublicTypeIndex = sym('https://club.example.com/profile/public-type-index.ttl')
+const ClubPrivateTypeIndex = sym('https://club.example.com/settings/private-type-index.ttl')
+
+const ClubProfile = `
+
+<#it> a vcard:Organization;
+    space:preferencesFile ${ClubPreferencesFile};
+    solid:publicTypeIndex ${ClubPublicTypeIndex};
+    vcard:fn "Card Club" .
+`
+const ClubPreferences =  `
+    ${club} solid:privateTypeIndex ${ClubPrivateTypeIndex} .
+`
+const ClubPublicTypes = `
+
+:chat1 solid:forClass meeting:LongChat; solid:instance <../publicStuff/ourChat.ttl#this> .
+
+:todo solid:forClass wf:Tracker; solid:instance  <../publicStuff/actionItems.ttl#this>.
+
+:issues solid:forClass wf:Tracker; solid:instance  <../project4/clubIssues.ttl#this>.
+`;
+
+const ClubPrivateTypes = `
+:id1592319218311 solid:forClass wf:Tracker; solid:instance  <../privateStuff/ToDo.ttl#this>.
+
+:id1592319391415 solid:forClass wf:Tracker; solid:instance <../privateStuff/Goals.ttl#this>.
+
+:id1595595377864 solid:forClass wf:Tracker; solid:instance <../privateStuff/tasks.ttl#this>.
+
+:id1596123375929 solid:forClass meeting:Meeting; solid:instance  <../project4/clubMeeting.ttl#this>.
+
+`;
+
+//------ Alice -------------------------------------------------------
+const alice = sym("https://alice.example.com/profile/card.ttl#me")
+const AliceProfileFile = alice.doc()
+const AlicePreferencesFile = sym('https://alice.example.com/settings/prefs.ttl')
+const AlicePublicTypeIndex = sym('https://alice.example.com/profile/public-type-index.ttl')
+const AlicePrivateTypeIndex = sym('https://alice.example.com/settings/private-type-index.ttl')
+const AlicePhotoFolder = sym(alice.dir().uri + "Photos/")
+const AliceProfile = `
+<#me> a vcard:Individual;
+    space:preferencesFile ${AlicePreferencesFile};
+    solid:publicTypeIndex ${AlicePublicTypeIndex};
+    vcard:fn "Alice" .
+`
+const AlicePreferences =  `
+    ${alice} solid:privateTypeIndex ${AlicePrivateTypeIndex};
+    solid:community ${club} .
+`
+const AlicePublicTypes = `
+
+:chat1 solid:forClass meeting:LongChat; solid:instance <../publicStuff/myChat.ttl#this> .
+
+:todo solid:forClass wf:Tracker; solid:instance  <../publicStuff/actionItems.ttl#this>.
+
+:issues solid:forClass wf:Tracker; solid:instance  <../project4/issues.ttl#this>.
+
+:photos solid:forClass schema:Image; solid:instanceContainer  ${AlicePhotoFolder} .
+`;
+
+const AlicePrivateTypes = `
+:id1592319218311 solid:forClass wf:Tracker; solid:instance  <../privateStuff/ToDo.ttl#this>.
+
+:id1592319391415 solid:forClass wf:Tracker; solid:instance <../privateStuff/Goals.ttl#this>.
+
+:id1595595377864 solid:forClass wf:Tracker; solid:instance <../privateStuff/workingOn.ttl#this>.
+
+:id1596123375929 solid:forClass meeting:Meeting; solid:instance  <../project4/meeting1.ttl#this>.
+
+`;
+
+const AlicePhotos = `
+<>
+    a ldp:BasicContainer, ldp:Container;
+    dct:modified "2021-04-26T05:34:16Z"^^xsd:dateTime;
+    ldp:contains
+        <photo1.png>, <photo2.png>, <photo3.png> ;
+    stat:mtime 1619415256.541;
+    stat:size 4096 .
+`
+
+//------ Bob -------------------------------------------------------
+const bob = sym('https://bob.example.com/profile/card.ttl#me')
+
+const BobProfile = `
+<#me> a vcard:Individual;
+vcard:fn "Bob" .
+`
+
+//------ Boby -------------------------------------------------------
+const boby = sym('https://boby.example.com/profile/card.ttl#me')
+
+const BobyProfile = `
+<#me> a vcard:Individual;
+vcard:fn "Boby" .
+`
+export function loadWebObject() {
+    const web = {}
+    web[alice.doc().uri] = AliceProfile
+    web[AlicePreferencesFile.uri] = AlicePreferences
+    web[AlicePrivateTypeIndex.uri] = AlicePrivateTypes
+    web[AlicePublicTypeIndex.uri] = AlicePublicTypes
+    web[AlicePhotoFolder.uri] = AlicePhotos
+    web[bob.doc().uri] = BobProfile
+    web[boby.doc().uri] = BobyProfile
+
+    web[club.doc().uri] = ClubProfile
+    web[ClubPreferencesFile.uri] = ClubPreferences
+    web[ClubPrivateTypeIndex.uri] = ClubPrivateTypes
+    web[ClubPublicTypeIndex.uri] = ClubPublicTypes
+    return web
+}
+
+function clearLocalStore(store) {
+    store.statements.slice().forEach(store.remove.bind(store))
+}
+
+export {
+    alice, bob, boby, club,
+    AlicePhotoFolder, AlicePreferences, AlicePhotos, AlicePreferencesFile, AlicePrivateTypeIndex, AlicePrivateTypes, AliceProfile, AliceProfileFile, AlicePublicTypeIndex, AlicePublicTypes,
+    BobProfile,
+    ClubPreferences, ClubPreferencesFile, ClubPrivateTypeIndex, ClubPrivateTypes, ClubProfile, ClubPublicTypeIndex, ClubPublicTypes,
+    clearLocalStore
+}

package/test/helpers/setup.ts

@@ -1,5 +1,9 @@
 import { error, log, trace, warn } from '../../src/util/debug'
 import fetchMock from "jest-fetch-mock";
+import { TextEncoder, TextDecoder } from 'util'
+global.TextEncoder = TextEncoder
+global.TextDecoder = TextDecoder
+
 
 fetchMock.enableMocks();
 // We don't want to output debug messages to console as part of the tests