Merge branch 'main' into stringUrl

Author: timea-solid

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-logic",
-  "version": "1.3.17",
+  "version": "2.1.2",
   "description": "Core business logic of Solid OS",
   "main": "lib/index.js",
   "scripts": {
@@ -25,26 +25,24 @@
   },
   "homepage": "https://github.com/solidos/solid-logic#readme",
   "devDependencies": {
-    "@babel/core": "^7.17.10",
-    "@babel/plugin-proposal-class-properties": "~7.16.7",
-    "@babel/plugin-proposal-optional-chaining": "~7.16.7",
-    "@babel/plugin-transform-async-to-generator": "~7.16.8",
-    "@babel/plugin-transform-runtime": "^7.17.0",
-    "@babel/preset-env": "~7.16.11",
-    "@babel/preset-typescript": "~7.16.7",
-    "@types/jest": "^27.4.1",
-    "@typescript-eslint/eslint-plugin": "^5.19.0",
-    "@typescript-eslint/parser": "^5.19.0",
-    "babel-jest": "^28.0.3",
-    "eslint": "^8.13.0",
+    "@babel/plugin-proposal-class-properties": "~7.18.6",
+    "@babel/plugin-proposal-optional-chaining": "~7.20.7",
+    "@babel/plugin-transform-async-to-generator": "~7.20.7",
+    "@babel/plugin-transform-runtime": "^7.19.6",
+    "@babel/preset-env": "~7.20.2",
+    "@babel/preset-typescript": "~7.18.6",
+    "@types/jest": "^27.5.2",
+    "@typescript-eslint/eslint-plugin": "^5.50.0",
+    "@typescript-eslint/parser": "^5.50.0",
+    "eslint": "^8.33.0",
     "jest": "^27.5.1",
     "jest-environment-node-debug": "^2.0.0",
     "jest-fetch-mock": "^3.0.3",
-    "typescript": "^4.6.3"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
-    "@inrupt/solid-client-authn-browser": "^1.11.7",
-    "rdflib": "^2.2.19",
+    "@inrupt/solid-client-authn-browser": "^1.13.0",
+    "rdflib": "^2.2.25",
     "solid-namespace": "^0.5.2"
   }
 }

package.json

@@ -3,13 +3,13 @@ import { InboxLogic } from "../types";
 import { getArchiveUrl } from "../util/utils";
 
 export function createInboxLogic(store, profileLogic, utilityLogic, containerLogic, aclLogic): InboxLogic {
-  
+
     async function createInboxFor(peerWebId: string, nick: string) {
       const myWebId: NamedNode = await profileLogic.loadMe();
       const podRoot: NamedNode = await profileLogic.getPodRoot(myWebId);
       const ourInbox = `${podRoot.value}p2p-inboxes/${encodeURIComponent(nick)}/`;
       await containerLogic.createContainer(ourInbox);
-      const aclDocUrl = await aclLogic.findAclDocUrl(sym(ourInbox))
+      // const aclDocUrl = await aclLogic.findAclDocUrl(ourInbox);
       await utilityLogic.setSinglePeerAccess({
         ownerWebId: myWebId.value,
         peerWebId,
@@ -55,4 +55,4 @@ export function createInboxLogic(store, profileLogic, utilityLogic, containerLog
     getNewMessages,
     markAsRead
   }
-}
+}

src/inbox/inboxLogic.ts

@@ -11,7 +11,7 @@ export function createProfileLogic(store, authn, utilityLogic): ProfileLogic {
     /**
      * loads the preference without throwing errors - if it can create it it does so.
      * remark: it still throws error if it cannot load profile.
-     * @param user 
+     * @param user
      * @returns undefined if preferenceFile cannot be returned or NamedNode if it can find it or create it
      */
     async function silencedLoadPreferences(user: NamedNode): Promise <NamedNode | undefined> {
@@ -25,7 +25,7 @@ export function createProfileLogic(store, authn, utilityLogic): ProfileLogic {
     /**
      * loads the preference without returning different errors if it cannot create or load it.
      * remark: it also throws error if it cannot load profile.
-     * @param user 
+     * @param user
      * @returns undefined if preferenceFile cannot be an Error or NamedNode if it can find it or create it
      */
     async function loadPreferences (user: NamedNode): Promise <NamedNode> {
@@ -48,9 +48,8 @@ export function createProfileLogic(store, authn, utilityLogic): ProfileLogic {
             throw err
         }
 
-        let response
         try {
-            response = await store.fetcher.load(preferencesFile as NamedNode)
+            await store.fetcher.load(preferencesFile as NamedNode)
         } catch (err) { // Maybe a permission problem or origin problem
             const msg = `Unable to load preference of user ${user}: ${err}`
             debug.warn(msg)
@@ -123,4 +122,3 @@ export function createProfileLogic(store, authn, utilityLogic): ProfileLogic {
         silencedLoadPreferences
     }
 }
-

src/profile/profileLogic.ts

@@ -2,7 +2,7 @@ import { NamedNode, st, sym } from 'rdflib'
 import { ScopedApp, TypeIndexLogic, TypeIndexScope } from '../types'
 import * as debug from "../util/debug"
 import { ns as namespace } from '../util/ns'
-import { newThing, uniqueNodes } from "../util/utils"
+import { newThing } from "../util/utils"
 
 export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic): TypeIndexLogic {
     const ns = namespace
@@ -155,29 +155,27 @@ export function createTypeIndexLogic(store, authn, profileLogic, utilityLogic):
 
     async function getScopedAppsFromIndex(scope: TypeIndexScope, theClass: NamedNode | null): Promise<ScopedApp[]> {
         const index = scope.index
+        const results: ScopedApp[] = []
         const registrations = store.statementsMatching(null, ns.solid('instance'), null, index)
             .concat(store.statementsMatching(null, ns.solid('instanceContainer'), null, index))
             .map(st => st.subject)
-        const relevant = theClass ? registrations.filter(reg => store.any(reg, ns.solid('forClass'), null, index)?.sameTerm(theClass))
-            : registrations
-        const directInstances = relevant.map(reg => store.each(reg, ns.solid('instance'), null, index).map(one => sym(one.value))).flat()
-        let instances = uniqueNodes(directInstances)
-
-        const instanceContainers = relevant.map(
-            reg => store.each(reg, ns.solid('instanceContainer'), null, index).map(one => sym(one.value))).flat()
-
-        //  instanceContainers may be deprocatable if no one has used them
-        const containers = uniqueNodes(instanceContainers)
-        if (containers.length > 0) { console.log('@@ getScopedAppsFromIndex containers ', containers) }
-        for (let i = 0; i < containers.length; i++) {
-            const cont = containers[i]
-            await store.fetcher.load(cont)
-            const contents = store.each(cont, ns.ldp('contains'), null, cont).map(one => sym(one.value))
-            instances = instances.concat(contents)
+        for (const reg of registrations) {
+          const klass = store.any(reg, ns.solid('forClass'), null, index)
+          if (!theClass || klass.sameTerm(theClass)) {
+            const instances = store.each(reg, ns.solid('instance'), null, index)
+            for (const instance of instances) {
+              results.push({ instance, type: klass, scope })
+            }
+            const containers = store.each(reg, ns.solid('instanceContainer'), null, index)
+            for (const instance of containers) {
+                await store.fetcher.load(instance)
+                results.push({ instance: sym(instance.value), type: klass,  scope })
+            }
+          }
         }
-        return instances.map(instance => { return { instance, scope } })
+        return results
     }
-    
+
     return {
         registerInTypeIndex,
         getRegistrations,

src/typeIndex/typeIndexLogic.ts

@@ -33,7 +33,7 @@ export interface SolidNamespace {
 }
 
 export type TypeIndexScope = { label: string, index: NamedNode, agent: NamedNode }
-export type ScopedApp = { instance: NamedNode, scope: TypeIndexScope }
+export type ScopedApp = { instance: NamedNode, type: NamedNode, scope: TypeIndexScope }
 
 export interface NewPaneOptions {
     me?: NamedNode;
@@ -119,4 +119,3 @@ export interface SolidLogic {
     updatePromise: (del: Array<Statement>, ins: Array<Statement>) => Promise<void>,
     clearStore: () => void
 }
-

src/types.ts

@@ -28,7 +28,8 @@ describe("Container", () => {
                 'https://container.com/bar/'
             ].sort());
     });
-    it("getContainerMembers- When container is empty - Resolves to an empty array", async () => {
+    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([]);
@@ -37,7 +38,7 @@ describe("Container", () => {
     function containerIsEmpty() {
         fetchMock.mockOnceIf(
             "https://com/",
-            " ", // FIXME: https://github.com/jefflau/jest-fetch-mock/issues/189
+            "", // FIXME: https://github.com/jefflau/jest-fetch-mock/issues/189
             {
                 headers: { "Content-Type": "text/turtle" },
             }