solid-logic 3.0.9-f51524a8 → 3.0.9-fa4d7e8

package/test/inboxLogic.test.ts

@@ -2,104 +2,104 @@
 * @jest-environment jsdom
 *
 */
-import { UpdateManager, Store, Fetcher, sym } from 'rdflib'
-import { createAclLogic } from '../src/acl/aclLogic'
-import { createInboxLogic } from '../src/inbox/inboxLogic'
-import { createProfileLogic } from '../src/profile/profileLogic'
-import { createContainerLogic } from '../src/util/containerLogic'
-import { createUtilityLogic } from '../src/util/utilityLogic'
+import { UpdateManager, Store, Fetcher, sym } from "rdflib";
+import { createAclLogic } from "../src/acl/aclLogic";
+import { createInboxLogic } from '../src/inbox/inboxLogic';
+import { createProfileLogic } from "../src/profile/profileLogic";
+import { createContainerLogic } from "../src/util/containerLogic";
+import { createUtilityLogic } from "../src/util/utilityLogic";
 
-const alice = sym('https://alice.example.com/profile/card#me')
-const bob = sym('https://bob.example.com/profile/card#me')
+const alice = sym("https://alice.example.com/profile/card#me");
+const bob = sym("https://bob.example.com/profile/card#me");
 
-describe('Inbox logic', () => {
-  let store
+describe("Inbox logic", () => {
+  let store;
   let inboxLogic
   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 containerLogic = createContainerLogic(store)
     const aclLogic = createAclLogic(store)
-    const util = createUtilityLogic(store, aclLogic, containerLogic)
-    const profile = createProfileLogic(store, authn, util)
-    inboxLogic = createInboxLogic(store, profile, util, containerLogic, aclLogic)
-  })
+    const util = createUtilityLogic(store, aclLogic, containerLogic);
+    const profile = createProfileLogic(store, authn, util);
+    inboxLogic = createInboxLogic(store, profile, util, containerLogic, aclLogic);
+  });
 
-  describe('getNewMessages', () => {
-    describe('When inbox is empty', () => {
-      let result
+  describe("getNewMessages", () => {
+    describe("When inbox is empty", () => {
+      let result;
       beforeEach(async () => {
-        bobHasAnInbox()
-        inboxIsEmpty()
-        result = await inboxLogic.getNewMessages(bob)
-      })
-      it('Resolves to an empty array', () => {
-        expect(result).toEqual([])
-      })
-    })
-    describe('When container has some containment triples', () => {
-      let result
+        bobHasAnInbox();
+        inboxIsEmpty();
+        result = await inboxLogic.getNewMessages(bob);
+      });
+      it("Resolves to an empty array", () => {
+        expect(result).toEqual([]);
+      });
+    });
+    describe("When container has some containment triples", () => {
+      let result;
       beforeEach(async () => {
-        bobHasAnInbox()
-        inboxHasSomeContainmentTriples()
-        const messages = await inboxLogic.getNewMessages(bob)
+        bobHasAnInbox();
+        inboxHasSomeContainmentTriples();
+        const messages = await inboxLogic.getNewMessages(bob);
         result = messages.map(oneMessage => oneMessage.value)
-      })
-      it('Resolves to an array with URLs of non-container resources in inbox', () => {
+      });
+      it("Resolves to an array with URLs of non-container resources in inbox", () => {
         expect(result.sort()).toEqual([
           'https://container.com/foo.txt'
-        ].sort())
-      })
-    })
-  })
+        ].sort());
+      });
+    });
+  });
   describe('createInboxFor', () => {
     beforeEach(async () => {
-      aliceHasValidProfile()
+      aliceHasValidProfile();
       // First for the PUT:
       fetchMock.mockOnceIf(
-        'https://alice.example.com/p2p-inboxes/Peer%20Person/',
-        'Created', {
+        "https://alice.example.com/p2p-inboxes/Peer%20Person/",
+        "Created", {
           status: 201
         }
       )
       // Then for the GET to read the ACL link:
       fetchMock.mockOnceIf(
-        'https://alice.example.com/p2p-inboxes/Peer%20Person/',
-        ' ', {
+        "https://alice.example.com/p2p-inboxes/Peer%20Person/",
+        " ", {
           status: 200,
           headers: {
             Link: '<https://some/acl>; rel="acl"',
           }
         }
       )
-      fetchMock.mockIf('https://some/acl', 'Created', { status: 201 })
+      fetchMock.mockIf("https://some/acl", "Created", { status: 201 });
 
-      await inboxLogic.createInboxFor('https://peer.com/#me', 'Peer Person')
-    })
-    it('creates the inbox', () => {
+      await inboxLogic.createInboxFor('https://peer.com/#me', 'Peer Person');
+    });
+    it("creates the inbox", () => {
       expect(fetchMock.mock.calls).toEqual([
-        [ 'https://alice.example.com/profile/card', fetchMock.mock.calls[0][1] ],
-        [ 'https://alice.example.com/p2p-inboxes/Peer%20Person/', {
-          body: ' ',
+        [ "https://alice.example.com/profile/card", fetchMock.mock.calls[0][1] ],
+        [ "https://alice.example.com/p2p-inboxes/Peer%20Person/", {
+          body: " ",
           headers: {
-            'Content-Type': 'text/turtle',
-            'If-None-Match': '*',
-            Link: '<http://www.w3.org/ns/ldp#BasicContainer>; rel="type"',
+            "Content-Type": "text/turtle",
+            "If-None-Match": "*",
+            Link: "<http://www.w3.org/ns/ldp#BasicContainer>; rel=\"type\"",
           },
-          method: 'PUT'      
+          method: "PUT"      
         }],
-        [ 'https://alice.example.com/p2p-inboxes/Peer%20Person/', fetchMock.mock.calls[2][1] ],
-        [ 'https://some/acl', {
+        [ "https://alice.example.com/p2p-inboxes/Peer%20Person/", fetchMock.mock.calls[2][1] ],
+        [ "https://some/acl", {
           body: '@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n' +
           '\n' +
           '<#alice> a acl:Authorization;\n' +
@@ -116,53 +116,53 @@ describe('Inbox logic', () => {
           ],
           method: 'PUT'
         }]
-      ])
-    })
+      ]);
+    });
 
-  })
+  });
   describe('markAsRead', () => {
     beforeEach(async () => {
       fetchMock.mockOnceIf(
-        'https://container.com/item.ttl',
-        '<#some> <#inbox> <#item> .',
+        "https://container.com/item.ttl",
+        "<#some> <#inbox> <#item> .",
         {
-          headers: { 'Content-Type': 'text/turtle' },
+          headers: { "Content-Type": "text/turtle" },
         }
-      )
+      );
       fetchMock.mockOnceIf(
-        'https://container.com/archive/2111/03/31/item.ttl',
-        'Created',
+        "https://container.com/archive/2111/03/31/item.ttl",
+        "Created",
         {
           status: 201,
-          headers: { 'Content-Type': 'text/turtle' },
+          headers: { "Content-Type": "text/turtle" },
         }
-      )
-      await inboxLogic.markAsRead('https://container.com/item.ttl', new Date('31 March 2111 UTC'))
-    })
+      );
+      await inboxLogic.markAsRead("https://container.com/item.ttl", new Date('31 March 2111 UTC'));
+    });
     it('moves the item to archive', async () => {
       expect(fetchMock.mock.calls).toEqual([
-        [ 'https://container.com/item.ttl' ],
+        [ "https://container.com/item.ttl" ],
         [
-          'https://container.com/archive/2111/03/31/item.ttl',
+          "https://container.com/archive/2111/03/31/item.ttl",
           {
-            'body': '<#some> <#inbox> <#item> .',
-            'headers': [
+            "body": "<#some> <#inbox> <#item> .",
+            "headers": [
               [
-                'Content-Type',
-                'text/turtle',
+                "Content-Type",
+                "text/turtle",
               ],
             ],
-            'method': 'PUT',
+            "method": "PUT",
           },
         ],
-        [ 'https://container.com/item.ttl', { method: 'DELETE' } ],
-      ])
-    })
-  })
+        [ "https://container.com/item.ttl", { method: 'DELETE' } ],
+      ]);
+    });
+  });
 
   function aliceHasValidProfile() {
     fetchMock.mockOnceIf(
-      'https://alice.example.com/profile/card',
+      "https://alice.example.com/profile/card",
       `
             <https://alice.example.com/profile/card#me>
               <http://www.w3.org/ns/pim/space#storage> <https://alice.example.com/> ;
@@ -170,40 +170,49 @@ describe('Inbox logic', () => {
             .`,
       {
         headers: {
-          'Content-Type': 'text/turtle',
+          "Content-Type": "text/turtle",
         },
       }
-    )
+    );
   }
 
   function bobHasAnInbox() {
     fetchMock.mockOnceIf(
-      'https://bob.example.com/profile/card',
-      '<https://bob.example.com/profile/card#me><http://www.w3.org/ns/ldp#inbox><https://container.com/>.',
+      "https://bob.example.com/profile/card",
+      "<https://bob.example.com/profile/card#me><http://www.w3.org/ns/ldp#inbox><https://container.com/>.",
       {
-        headers: { 'Content-Type': 'text/turtle' },
+        headers: { "Content-Type": "text/turtle" },
       }
-    )
+    );
   }
 
   function inboxIsEmpty() {
     fetchMock.mockOnceIf(
-      'https://container.com/',
-      ' ', // FIXME: https://github.com/jefflau/jest-fetch-mock/issues/189
+      "https://container.com/",
+      " ", // FIXME: https://github.com/jefflau/jest-fetch-mock/issues/189
       {
-        headers: { 'Content-Type': 'text/turtle' },
+        headers: { "Content-Type": "text/turtle" },
       }
-    )
+    );
   }
 
   function inboxHasSomeContainmentTriples() {
     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" },
       }
-    )
+    );
   }
 
-})
+  function inboxItemExists() {
+    fetchMock.mockOnceIf(
+      "https://container.com/item.ttl",
+      "<#some> <#inbox> <#item> .",
+      {
+        headers: { "Content-Type": "text/turtle" },
+      }
+    );
+  }
+});

package/test/logic.test.ts

@@ -1,5 +1,5 @@
-import { solidLogicSingleton } from '../src/logic/solidLogicSingleton'
-import { silenceDebugMessages } from './helpers/setup'
+import { solidLogicSingleton } from "../src/logic/solidLogicSingleton"
+import { silenceDebugMessages } from "./helpers/setup"
 
 silenceDebugMessages()
 

package/test/profileLogic.test.ts

@@ -2,23 +2,23 @@
 * @jest-environment jsdom
 * 
 */
-import { UpdateManager, Store, Fetcher } from 'rdflib'
-import { createProfileLogic } from '../src/profile/profileLogic'
-import { createUtilityLogic } from '../src/util/utilityLogic'
-import { ns } from '../src/util/ns'
+import { UpdateManager, Store, Fetcher } from 'rdflib';
+import { createProfileLogic } from "../src/profile/profileLogic";
+import { createUtilityLogic } from "../src/util/utilityLogic"
+import { ns } from "../src/util/ns";
 import {
     alice, AlicePreferencesFile, AlicePrivateTypeIndex, AliceProfileFile, bob, boby, loadWebObject
-} from './helpers/dataSetup'
-import { createAclLogic } from '../src/acl/aclLogic'
-import { createContainerLogic } from '../src/util/containerLogic'
+} from './helpers/dataSetup';
+import { createAclLogic } from "../src/acl/aclLogic";
+import { createContainerLogic } from "../src/util/containerLogic";
 
 const prefixes = Object.keys(ns).map(prefix => `@prefix ${prefix}: ${ns[prefix]('')}.\n`).join('') // In turtle
 const user = alice
 const profile = user.doc()
-let requests: Request[] = []
+let requests = []
 let profileLogic
 
-describe('Profile', () => {
+describe("Profile", () => {
 
     describe('loadProfile', () => {
         window.$SolidTestEnvironment = { username: alice.uri }
@@ -28,11 +28,11 @@ describe('Profile', () => {
         let web = {}
         const authn = {
             currentUser: () => {
-                return alice
+                return alice;
             },
-        }
+        };
         beforeEach(() => {
-            fetchMock.resetMocks()
+            fetchMock.resetMocks();
             web = loadWebObject()
             requests = []
             fetchMock.mockIf(/^https?.*$/, async req => {
@@ -52,9 +52,9 @@ describe('Profile', () => {
                     body: prefixes + contents, // Add namespaces to anything
                     status: 200,
                     headers: {
-                        'Content-Type': 'text/turtle',
-                        'WAC-Allow':    'user="write", public="read"',
-                        'Accept-Patch': 'application/sparql-update'
+                        "Content-Type": "text/turtle",
+                        "WAC-Allow":    'user="write", public="read"',
+                        "Accept-Patch": "application/sparql-update"
                     }
                     }
                 } // if contents
@@ -65,8 +65,8 @@ describe('Profile', () => {
             })
 
             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 util = createUtilityLogic(store, createAclLogic(store), createContainerLogic(store))
             profileLogic = createProfileLogic(store, authn, util)
         })
@@ -91,11 +91,11 @@ describe('Profile', () => {
         let web = {}
         const authn = {
             currentUser: () => {
-                return alice
+                return alice;
             },
-        }
+        };
         beforeEach(() => {
-            fetchMock.resetMocks()
+            fetchMock.resetMocks();
             web = loadWebObject()
             requests = []
             fetchMock.mockIf(/^https?.*$/, async req => {
@@ -115,9 +115,9 @@ describe('Profile', () => {
                     body: prefixes + contents, // Add namespaces to anything
                     status: 200,
                     headers: {
-                        'Content-Type': 'text/turtle',
-                        'WAC-Allow':    'user="write", public="read"',
-                        'Accept-Patch': 'application/sparql-update'
+                        "Content-Type": "text/turtle",
+                        "WAC-Allow":    'user="write", public="read"',
+                        "Accept-Patch": "application/sparql-update"
                     }
                     }
                 } // if contents
@@ -128,8 +128,8 @@ describe('Profile', () => {
             })
 
             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 util = createUtilityLogic(store, createAclLogic(store), createContainerLogic(store))
             profileLogic = createProfileLogic(store, authn, util)
         })
@@ -147,7 +147,6 @@ describe('Profile', () => {
             expect(store.holds(user, ns.solid('privateTypeIndex'), AlicePrivateTypeIndex, AlicePreferencesFile)).toEqual(true)
         })
         it('creates new file', async () => {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const result = await profileLogic.silencedLoadPreferences(bob)
 
             const patchRequest = requests[0]
@@ -173,11 +172,11 @@ describe('Profile', () => {
         let web = {}
         const authn = {
             currentUser: () => {
-                return boby
+                return boby;
             },
-        }
+        };
         beforeEach(() => {
-            fetchMock.resetMocks()
+            fetchMock.resetMocks();
             web = loadWebObject()
             requests = []
             fetchMock.mockIf(/^https?.*$/, async req => {
@@ -197,9 +196,9 @@ describe('Profile', () => {
                     body: prefixes + contents, // Add namespaces to anything
                     status: 200,
                     headers: {
-                        'Content-Type': 'text/turtle',
-                        'WAC-Allow':    'user="write", public="read"',
-                        'Accept-Patch': 'application/sparql-update'
+                        "Content-Type": "text/turtle",
+                        "WAC-Allow":    'user="write", public="read"',
+                        "Accept-Patch": "application/sparql-update"
                     }
                     }
                 } // if contents
@@ -210,8 +209,8 @@ describe('Profile', () => {
             })
 
             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 util = createUtilityLogic(store, createAclLogic(store), createContainerLogic(store))
             profileLogic = createProfileLogic(store, authn, util)
         })
@@ -229,7 +228,6 @@ describe('Profile', () => {
             expect(store.holds(user, ns.solid('privateTypeIndex'), AlicePrivateTypeIndex, AlicePreferencesFile)).toEqual(true)
         })
         it('creates new file', async () => {
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const result = await profileLogic.loadPreferences(boby)
 
             const patchRequest = requests[0]

package/test/solidAuthLogic.test.ts

@@ -10,7 +10,7 @@ import { AuthenticationContext } from '../src/types'
 silenceDebugMessages()
 let solidAuthnLogic
 
-describe('SolidAuthnLogic', () => {
+describe("SolidAuthnLogic", () => {
   
   beforeEach(() => {
     solidAuthnLogic = new SolidAuthnLogic(authSession)