solid-panes 3.5.16 → 3.5.18

package/lib/versionInfo.js

@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = {
-  buildTime: '2022-01-29T08:00:13Z',
-  commit: 'ad1ef0272c97b0830f9cb8d74ab8d42af173bcc1',
+  buildTime: '2022-02-09T21:57:45Z',
+  commit: '4a26c02f8dd05c09ac1514e14ddcb6755a0a28cc',
   npmInfo: {
-    'solid-panes': '3.5.15',
+    'solid-panes': '3.5.18',
     npm: '6.14.13',
     ares: '1.17.1',
     brotli: '1.0.9',

package/lib/versionInfo.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/versionInfo.ts"],"names":["buildTime","commit","npmInfo","npm","ares","brotli","cldr","icu","llhttp","modules","napi","nghttp2","node","openssl","tz","unicode","uv","v8","zlib"],"mappings":";;;;;;eAAe;AACbA,EAAAA,SAAS,EAAE,sBADE;AAEbC,EAAAA,MAAM,EAAE,0CAFK;AAGbC,EAAAA,OAAO,EACT;AACE,mBAAe,QADjB;AAEEC,IAAAA,GAAG,EAAE,SAFP;AAGEC,IAAAA,IAAI,EAAE,QAHR;AAIEC,IAAAA,MAAM,EAAE,OAJV;AAKEC,IAAAA,IAAI,EAAE,MALR;AAMEC,IAAAA,GAAG,EAAE,MANP;AAOEC,IAAAA,MAAM,EAAE,OAPV;AAQEC,IAAAA,OAAO,EAAE,IARX;AASEC,IAAAA,IAAI,EAAE,GATR;AAUEC,IAAAA,OAAO,EAAE,QAVX;AAWEC,IAAAA,IAAI,EAAE,SAXR;AAYEC,IAAAA,OAAO,EAAE,QAZX;AAaEC,IAAAA,EAAE,EAAE,OAbN;AAcEC,IAAAA,OAAO,EAAE,MAdX;AAeEC,IAAAA,EAAE,EAAE,QAfN;AAgBEC,IAAAA,EAAE,EAAE,oBAhBN;AAiBEC,IAAAA,IAAI,EAAE;AAjBR;AAJe,C","sourcesContent":["export default {\n  buildTime: '2022-01-29T08:00:13Z',\n  commit: 'ad1ef0272c97b0830f9cb8d74ab8d42af173bcc1',\n  npmInfo:\n{\n  'solid-panes': '3.5.15',\n  npm: '6.14.13',\n  ares: '1.17.1',\n  brotli: '1.0.9',\n  cldr: '39.0',\n  icu: '69.1',\n  llhttp: '2.1.3',\n  modules: '83',\n  napi: '8',\n  nghttp2: '1.42.0',\n  node: '14.17.3',\n  openssl: '1.1.1k',\n  tz: '2021a',\n  unicode: '13.0',\n  uv: '1.41.0',\n  v8: '8.4.371.23-node.67',\n  zlib: '1.2.11'\n}\n}\n"],"file":"versionInfo.js"}
+{"version":3,"sources":["../src/versionInfo.ts"],"names":["buildTime","commit","npmInfo","npm","ares","brotli","cldr","icu","llhttp","modules","napi","nghttp2","node","openssl","tz","unicode","uv","v8","zlib"],"mappings":";;;;;;eAAe;AACbA,EAAAA,SAAS,EAAE,sBADE;AAEbC,EAAAA,MAAM,EAAE,0CAFK;AAGbC,EAAAA,OAAO,EACT;AACE,mBAAe,QADjB;AAEEC,IAAAA,GAAG,EAAE,SAFP;AAGEC,IAAAA,IAAI,EAAE,QAHR;AAIEC,IAAAA,MAAM,EAAE,OAJV;AAKEC,IAAAA,IAAI,EAAE,MALR;AAMEC,IAAAA,GAAG,EAAE,MANP;AAOEC,IAAAA,MAAM,EAAE,OAPV;AAQEC,IAAAA,OAAO,EAAE,IARX;AASEC,IAAAA,IAAI,EAAE,GATR;AAUEC,IAAAA,OAAO,EAAE,QAVX;AAWEC,IAAAA,IAAI,EAAE,SAXR;AAYEC,IAAAA,OAAO,EAAE,QAZX;AAaEC,IAAAA,EAAE,EAAE,OAbN;AAcEC,IAAAA,OAAO,EAAE,MAdX;AAeEC,IAAAA,EAAE,EAAE,QAfN;AAgBEC,IAAAA,EAAE,EAAE,oBAhBN;AAiBEC,IAAAA,IAAI,EAAE;AAjBR;AAJe,C","sourcesContent":["export default {\n  buildTime: '2022-02-09T21:57:45Z',\n  commit: '4a26c02f8dd05c09ac1514e14ddcb6755a0a28cc',\n  npmInfo:\n{\n  'solid-panes': '3.5.18',\n  npm: '6.14.13',\n  ares: '1.17.1',\n  brotli: '1.0.9',\n  cldr: '39.0',\n  icu: '69.1',\n  llhttp: '2.1.3',\n  modules: '83',\n  napi: '8',\n  nghttp2: '1.42.0',\n  node: '14.17.3',\n  openssl: '1.1.1k',\n  tz: '2021a',\n  unicode: '13.0',\n  uv: '1.41.0',\n  v8: '8.4.371.23-node.67',\n  zlib: '1.2.11'\n}\n}\n"],"file":"versionInfo.js"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-panes",
-  "version": "3.5.16",
+  "version": "3.5.18",
   "description": "Solid-compatible Panes: applets and views for the mashlib and databrowser",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/outline/manager.js

@@ -416,23 +416,23 @@ export default function (context) {
       .concat(pods)
 
     async function getPods () {
-      async function addPodRoot (pod) { // namedNode
-        await checkForContainerRepresentation(pod)
+      async function addPodStorage (pod) { // namedNode
+        await loadContainerRepresentation(pod)
         if (kb.holds(pod, ns.rdf('type'), ns.space('Storage'), pod.doc())) {
           pods.push(pod)
           return true
         }
         return false
       }
-      async function addPodRootFromUrl (url) {
+      async function addPodStorageFromUrl (url) {
         const podStorage = new URL(url)
-        // check that origin is not included in pods array
-        if (!pods.some(pod => pod.uri.includes(podStorage.origin))) {
-          // check in order, location.origin/<podName> then location.origin containing space:Storage
-          if (podStorage.pathname === '/' || !(await addPodRoot(kb.sym(`${podStorage.origin}/${podStorage.pathname.split('/')[1]}/`)))) {
-            await addPodRoot(kb.sym(`${podStorage.origin}/`))
-          }
+        // check for predicate pim:Storage in containers up the path tree
+        let pathStorage = podStorage.pathname
+        while (pathStorage.length) {
+          pathStorage = pathStorage.substring(0, pathStorage.lastIndexOf('/'))
+          if (await addPodStorage(kb.sym(`${podStorage.origin}${pathStorage}/`))) return
         }
+        // TODO should url.origin be added to pods list when there are no pim:Storage ???
       }
 
       try {
@@ -442,16 +442,30 @@ export default function (context) {
         console.error('Unable to load profile', err)
         return []
       }
-      const pods = kb.each(me, ns.space('storage'), null, me.doc())
+      // load pod's storages from profile
+      let pods = kb.each(me, ns.space('storage'), null, me.doc())
+      pods.map(async (pod) => {
+        // TODO use addPodStorageFromUrl(pod.uri) to check for pim:Storage ???
+        await loadContainerRepresentation(pod)
+      })
 
       try {
         // if uri then SolidOS is a browse.html web app
         const uri = (new URL(window.location.href)).searchParams.get('uri')
         const podUrl = uri || window.location.href
-        await addPodRootFromUrl(podUrl.substring(0, podUrl.lastIndexOf('/') + 1))
+        await addPodStorageFromUrl(podUrl)
       } catch (err) {
         console.error('cannot load container', err)
       }
+      // remove namedNodes duplicates
+      function uniques (nodes) {
+        const uniqueNodes = []
+        nodes.forEach(node => {
+          if (!uniqueNodes.find(uniqueNode => uniqueNode.equals(node))) uniqueNodes.push(node)
+        })
+        return uniqueNodes
+      }
+      pods = uniques(pods)
       if (!pods.length) return []
       return pods.map((pod, index) => {
         function split (item) { return item.uri.split('//')[1].slice(0, -1) }
@@ -566,7 +580,7 @@ export default function (context) {
     )
   }
 
-  async function checkForContainerRepresentation (subject) {
+  async function loadContainerRepresentation (subject) {
     // force reload for index.html with RDFa
     if (!kb.any(subject, ns.ldp('contains'), undefined, subject.doc())) {
       const response = await kb.fetcher.webOperation('GET', subject.uri, kb.fetcher.initFetchOptions(subject.uri, { headers: { accept: 'text/turtle' } }))
@@ -577,7 +591,7 @@ export default function (context) {
 
   async function getRelevantPanes (subject, context) {
     // make sure container representation is loaded (when server returns index.html)
-    if (subject.uri.endsWith('/')) { await checkForContainerRepresentation(subject) }
+    if (subject.uri.endsWith('/')) { await loadContainerRepresentation(subject) }
     const panes = context.session.paneRegistry
     const relevantPanes = panes.list.filter(
       pane => pane.label(subject, context) && !pane.global

package/src/versionInfo.ts

@@ -1,9 +1,9 @@
 export default {
-  buildTime: '2022-01-29T08:00:13Z',
-  commit: 'ad1ef0272c97b0830f9cb8d74ab8d42af173bcc1',
+  buildTime: '2022-02-09T21:57:45Z',
+  commit: '4a26c02f8dd05c09ac1514e14ddcb6755a0a28cc',
   npmInfo:
 {
-  'solid-panes': '3.5.15',
+  'solid-panes': '3.5.18',
   npm: '6.14.13',
   ares: '1.17.1',
   brotli: '1.0.9',