solid-logic 3.0.9-f51524a8 → 3.0.9-fa4d7e8

package/test/chatLogic.test.ts

@@ -2,97 +2,91 @@
 * @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'
-
-declare global {
-  interface Window {
-    $SolidTestEnvironment?: { username: string }
-  }
-}
+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";
 
 window.$SolidTestEnvironment = { username: alice.uri }
 
-describe('Chat logic', () => {
-  let chatLogic
-  let store
+describe("Chat logic", () => {
+  let chatLogic;
+  let store;
   beforeEach(() => {
-    fetchMock.resetMocks()
-    fetchMock.mockResponse('Not Found', {
+    fetchMock.resetMocks();
+    fetchMock.mockResponse("Not Found", {
       status: 404,
-    })
+    });
     store = new Store()
-    store.fetcher = new Fetcher(store, { fetch: fetch })
-    store.updater = new UpdateManager(store)
+    store.fetcher = new Fetcher(store, { fetch: fetch });
+    store.updater = new UpdateManager(store);
     const authn = {
       currentUser: () => {
-        return alice
+        return alice;
       },
-    }
+    };
     const util = createUtilityLogic(store, createAclLogic(store), createContainerLogic(store))
     chatLogic = createChatLogic(store, createProfileLogic(store, authn, util))
-  })
+  });
 
-  describe('get chat, without creating', () => {
-    describe('when no chat exists yet', () => {
-      let result
+  describe("get chat, without creating", () => {
+    describe("when no chat exists yet", () => {
+      let result;
       beforeEach(async () => {
-        aliceHasValidProfile()
-        noChatWithBobExists()
-        result = await chatLogic.getChat(bob, false)
-      })
-      it('does not return a chat', async () => {
-        expect(result).toBeNull()
-      })
-      it('loaded the current user profile', () => {
+        aliceHasValidProfile();
+        noChatWithBobExists();
+        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.com/profile/card.ttl'
-        )
-      })
-      it('tried to load the chat document', () => {
+          "https://alice.example.com/profile/card.ttl"
+        );
+      });
+      it("tried to load the chat document", () => {
         expect(fetchMock.mock.calls[1][0]).toBe(
-          'https://alice.example.com/IndividualChats/bob.example.com/index.ttl'
-        )
-      })
-      it('has no additional fetch requests', () => {
-        expect(fetchMock.mock.calls.length).toBe(2)
-      })
-    })
-  })
+          "https://alice.example.com/IndividualChats/bob.example.com/index.ttl"
+        );
+      });
+      it("has no additional fetch requests", () => {
+        expect(fetchMock.mock.calls.length).toBe(2);
+      });
+    });
+  });
 
-  describe('get chat, create if missing', () => {
-    describe('when no chat exists yet', () => {
-      let result
+  describe("get chat, create if missing", () => {
+    describe("when no chat exists yet", () => {
+      let result;
       beforeEach(async () => {
         Date.now = jest.fn(() =>
           new Date(Date.UTC(2021, 1, 6, 10, 11, 12)).valueOf()
-        )
-        aliceHasValidProfile()
-        noChatWithBobExists()
-        chatWithBobCanBeCreated()
-        bobHasAnInbox()
-        invitationCanBeSent()
-        chatContainerIsFound()
-        chatContainerAclCanBeSet()
-        editablePrivateTypeIndexIsFound()
-        privateTypeIndexIsUpdated()
-        result = await chatLogic.getChat(bob, true)
-      })
-      it('returns the chat URI based on the invitee\'s WebID', () => {
+        );
+        aliceHasValidProfile();
+        noChatWithBobExists();
+        chatWithBobCanBeCreated();
+        bobHasAnInbox();
+        invitationCanBeSent();
+        chatContainerIsFound();
+        chatContainerAclCanBeSet();
+        editablePrivateTypeIndexIsFound();
+        privateTypeIndexIsUpdated();
+        result = await chatLogic.getChat(bob, true);
+      });
+      it("returns the chat URI based on the invitee's WebID", () => {
         expect(result.uri).toBe(
-          'https://alice.example.com/IndividualChats/bob.example.com/index.ttl#this'
-        )
-      })
-      it('created a chat document', () => {
+          "https://alice.example.com/IndividualChats/bob.example.com/index.ttl#this"
+        );
+      });
+      it("created a chat document", () => {
         const request = getRequestTo(
-          'PUT',
-          'https://alice.example.com/IndividualChats/bob.example.com/index.ttl'
-        )
+          "PUT",
+          "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#>.
@@ -104,13 +98,13 @@ describe('Chat logic', () => {
     dc:author c:me;
     dc:created "2021-02-06T10:11:12Z"^^xsd:dateTime;
     dc:title "Chat channel".
-`)
-      })
-      it('allowed Bob to participate in the chat by adding an ACL', () => {
+`);
+      });
+      it("allowed Bob to participate in the chat by adding an ACL", () => {
         const request = getRequestTo(
-          'PUT',
-          'https://alice.example.com/IndividualChats/bob.example.com/.acl'
-        )
+          "PUT",
+          "https://alice.example.com/IndividualChats/bob.example.com/.acl"
+        );
         expect(request.body).toBe(`
             @prefix acl: <http://www.w3.org/ns/auth/acl#>.
             <#owner>
@@ -127,59 +121,59 @@ describe('Chat logic', () => {
             acl:default <.>;
             acl:mode
                 acl:Read, acl:Append.
-            `)
-      })
-      it('sent an invitation to invitee inbox', () => {
-        const request = getRequestTo('POST', 'https://bob.example.com/inbox')
+            `);
+      });
+      it("sent an invitation to invitee 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.com/IndividualChats/bob.example.com/index.ttl#this> .
-        `)
-      })
-      it('added the new chat to private type index', () => {
+        `);
+      });
+      it("added the new chat to private type index", () => {
         const request = getRequestTo(
-          'PATCH',
-          'https://alice.example.com/settings/privateTypeIndex.ttl'
-        )
+          "PATCH",
+          "https://alice.example.com/settings/privateTypeIndex.ttl"
+        );
         expect(request.body)
           .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> .
  }
-`)
-      })
-      it('has no additional fetch requests', () => {
-        expect(fetchMock.mock.calls.length).toBe(9)
-      })
-    })
-  })
+`);
+      });
+      it("has no additional fetch requests", () => {
+        expect(fetchMock.mock.calls.length).toBe(9);
+      });
+    });
+  });
 
-  describe('possible errors', () => {
-    it('profile does not link to storage', async () => {
-      fetchMock.mockOnceIf('https://alice.example.com/profile/card.ttl', '<><><>.', {
+  describe("possible errors", () => {
+    it("profile does not link to storage", async () => {
+      fetchMock.mockOnceIf("https://alice.example.com/profile/card.ttl", "<><><>.", {
         headers: {
-          'Content-Type': 'text/turtle',
+          "Content-Type": "text/turtle",
         },
-      })
-      const expectedError = new Error('User pod root not found!')
-      await expect(chatLogic.getChat(bob, false)).rejects.toEqual(expectedError)
-    })
+      });
+      const expectedError = new Error("User pod root not found!");
+      await expect(chatLogic.getChat(bob, false)).rejects.toEqual(expectedError);
+    });
 
-    it('invitee inbox not found', async () => {
-      aliceHasValidProfile()
-      noChatWithBobExists()
-      chatWithBobCanBeCreated()
-      bobDoesNotHaveAnInbox()
+    it("invitee inbox not found", async () => {
+      aliceHasValidProfile();
+      noChatWithBobExists();
+      chatWithBobCanBeCreated();
+      bobDoesNotHaveAnInbox();
       const expectedError = new Error(
-        'Invitee inbox not found! https://bob.example.com/profile/card.ttl#me'
-      )
-      await expect(chatLogic.getChat(bob, true)).rejects.toEqual(expectedError)
-    })
-  })
+        "Invitee inbox not found! https://bob.example.com/profile/card.ttl#me"
+      );
+      await expect(chatLogic.getChat(bob, true)).rejects.toEqual(expectedError);
+    });
+  });
 
   function aliceHasValidProfile() {
     fetchMock.mockOnceIf(
-      'https://alice.example.com/profile/card.ttl',
+      "https://alice.example.com/profile/card.ttl",
       `
             <https://alice.example.com/profile/card.ttl#me>
               <http://www.w3.org/ns/pim/space#storage> <https://alice.example.com/> ;
@@ -187,136 +181,136 @@ describe('Chat logic', () => {
             .`,
       {
         headers: {
-          'Content-Type': 'text/turtle',
+          "Content-Type": "text/turtle",
         },
       }
-    )
+    );
   }
 
   function noChatWithBobExists() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === 'https://alice.example.com/IndividualChats/bob.example.com/index.ttl' &&
-        method === 'GET',
-      'Not found',
+        url === "https://alice.example.com/IndividualChats/bob.example.com/index.ttl" &&
+        method === "GET",
+      "Not found",
       {
         status: 404,
       }
-    )
+    );
   }
 
   function chatWithBobCanBeCreated() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === 'https://alice.example.com/IndividualChats/bob.example.com/index.ttl' &&
-        method === 'PUT',
-      'Created',
+        url === "https://alice.example.com/IndividualChats/bob.example.com/index.ttl" &&
+        method === "PUT",
+      "Created",
       {
         status: 201,
       }
-    )
+    );
   }
 
   function bobHasAnInbox() {
     fetchMock.mockOnceIf(
-      '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>.',
+      "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' },
+        headers: { "Content-Type": "text/turtle" },
       }
-    )
+    );
   }
 
   function bobDoesNotHaveAnInbox() {
-    fetchMock.mockOnceIf('https://bob.example.com/profile/card.ttl', '<><><>.', {
+    fetchMock.mockOnceIf("https://bob.example.com/profile/card.ttl", "<><><>.", {
       headers: {
-        'Content-Type': 'text/turtle',
+        "Content-Type": "text/turtle",
       },
-    })
+    });
   }
 
   function invitationCanBeSent() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === 'https://bob.example.com/inbox' && method === 'POST',
-      'Created',
+        url === "https://bob.example.com/inbox" && method === "POST",
+      "Created",
       {
         status: 201,
         headers: {
           location:
-            'https://bob.example.com/inbox/22373339-6cc0-49fc-b69e-0402edda6e4e.ttl',
+            "https://bob.example.com/inbox/22373339-6cc0-49fc-b69e-0402edda6e4e.ttl",
         },
       }
-    )
+    );
   }
 
   function chatContainerIsFound() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === 'https://alice.example.com/IndividualChats/bob.example.com/' &&
-        method === 'GET',
-      '<><><>.',
+        url === "https://alice.example.com/IndividualChats/bob.example.com/" &&
+        method === "GET",
+      "<><><>.",
       {
         status: 200,
         headers: {
-          'Content-Type': 'text/turtle',
+          "Content-Type": "text/turtle",
           Link: '<.acl>; rel="acl"',
         },
       }
-    )
+    );
   }
 
   function chatContainerAclCanBeSet() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === 'https://alice.example.com/IndividualChats/bob.example.com/.acl' &&
-        method === 'PUT',
-      'Created',
+        url === "https://alice.example.com/IndividualChats/bob.example.com/.acl" &&
+        method === "PUT",
+      "Created",
       {
         status: 201,
       }
-    )
+    );
   }
 
   function editablePrivateTypeIndexIsFound() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === 'https://alice.example.com/settings/privateTypeIndex.ttl' &&
-        method === 'GET',
-      '<><><>.',
+        url === "https://alice.example.com/settings/privateTypeIndex.ttl" &&
+        method === "GET",
+      "<><><>.",
       {
         status: 200,
         headers: {
-          'Content-Type': 'text/turtle',
-          'wac-allow': 'user="read write append control",public=""',
-          'ms-author-via': 'SPARQL',
+          "Content-Type": "text/turtle",
+          "wac-allow": 'user="read write append control",public=""',
+          "ms-author-via": "SPARQL",
         },
       }
-    )
+    );
   }
 
   function privateTypeIndexIsUpdated() {
     return fetchMock.mockOnceIf(
       ({ url, method }) =>
-        url === 'https://alice.example.com/settings/privateTypeIndex.ttl' &&
-        method === 'PATCH',
-      'OK',
+        url === "https://alice.example.com/settings/privateTypeIndex.ttl" &&
+        method === "PATCH",
+      "OK",
       {
         status: 200,
       }
-    )
+    );
   }
 
   function getRequestTo(
-    method: 'GET' | 'PUT' | 'POST' | 'DELETE' | 'PATCH',
+    method: "GET" | "PUT" | "POST" | "DELETE" | "PATCH",
     url: string
   ): RequestInit {
     const call = fetchMock.mock.calls.find(
       (it) => it[0] === url && method === it[1]?.method
-    )
-    expect(call).not.toBeNull()
-    const request = call?.[1]
-    expect(request).not.toBeNull()
-    return request!
+    );
+    expect(call).not.toBeNull();
+    const request = call?.[1];
+    expect(request).not.toBeNull();
+    return request!;
   }
-})
+});

package/test/container.test.ts

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

package/test/helpers/dataSetup.ts

@@ -46,8 +46,7 @@ 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 aliceDir = alice.dir();
-const AlicePhotoFolder = sym((aliceDir && aliceDir.uri ? aliceDir.uri : "") + "Photos/")
+const AlicePhotoFolder = sym(alice.dir().uri + "Photos/")
 const AliceProfile = `
 <#me> a vcard:Individual;
     space:preferencesFile ${AlicePreferencesFile};

package/test/helpers/setup.ts

@@ -1,13 +1,8 @@
 import { error, log, trace, warn } from '../../src/util/debug'
 import fetchMock from "jest-fetch-mock";
-import { TextEncoder as UtilTextEncoder, TextDecoder as UtilTextDecoder } from 'util'
-
-if (typeof global.TextEncoder === 'undefined') {
-  global.TextEncoder = UtilTextEncoder as unknown as { new (): TextEncoder; prototype: TextEncoder }
-}
-if (typeof global.TextDecoder === 'undefined') {
-  global.TextDecoder = UtilTextDecoder as unknown as { new (): TextDecoder; prototype: TextDecoder }
-}
+import { TextEncoder, TextDecoder } from 'util'
+global.TextEncoder = TextEncoder
+global.TextDecoder = TextDecoder
 
 
 fetchMock.enableMocks();