solid-ui 2.4.22-dc79c0e3 → 2.4.22-e594bdfb

package/dist/main.js

@@ -2745,8 +2745,7 @@ function updatePromise(del, ins) {
     }); // callback
 
   }); // promise
-} // export findBookmarkDocument,
-
+}
 /*         Bookmarking
  */
 
@@ -7105,8 +7104,9 @@ var _debug = __webpack_require__(/*! ./debug */ "./lib/debug.js");
  */
 
 /* eslint-disable multiline-ternary */
-// Do not export. lways us this module to find the icons, as it varies
-var iconsOnGithub = 'https://solidos.github.io/solid-ui/src';
+// Do not export. Always us this module to find the icons, as they vary
+var iconsOnGithub = 'https://solidos.github.io/solid-ui/src'; // changed org 2022-05
+
 var icons = module.scriptURI // Firefox extension
 ? {
   iconBase: module.scriptURI.slice(0, module.scriptURI.lastIndexOf('/')) + '/icons/',
@@ -7754,7 +7754,9 @@ exports.loginStatusBox = loginStatusBox;
 exports.newAppInstance = newAppInstance;
 exports.registrationControl = registrationControl;
 exports.registrationList = registrationList;
+exports.renderScopeHeadingRow = renderScopeHeadingRow;
 exports.renderSignInPopup = renderSignInPopup;
+exports.scopeLabel = scopeLabel;
 exports.selectWorkspace = selectWorkspace;
 
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js"));
@@ -7775,7 +7777,7 @@ var _signup = __webpack_require__(/*! ../signup/signup.js */ "./lib/signup/signu
 
 var _style = __webpack_require__(/*! ../style */ "./lib/style.js");
 
-var _index = __webpack_require__(/*! ../utils/index */ "./lib/utils/index.js");
+var utils = _interopRequireWildcard(__webpack_require__(/*! ../utils */ "./lib/utils/index.js"));
 
 var widgets = _interopRequireWildcard(__webpack_require__(/*! ../widgets */ "./lib/widgets/index.js"));
 
@@ -7783,39 +7785,20 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-/* eslint-disable camelcase */
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
-/**
- * Signing in, signing up, profile and preferences reloading
- * Type index management
- *
- * Many functions in this module take a context object which
- * holds various RDF symbols, add to it, and return a promise of it.
- *
- * * `me`                RDF symbol for the user's WebID
- * * `publicProfile`     The user's public profile, iff loaded
- * * `preferencesFile`   The user's personal preference file, iff loaded
- * * `index.public`      The user's public type index file
- * * `index.private`     The user's private type index file
- *
- * Not RDF symbols:
- * * `noun`            A string in english for the type of thing -- like "address book"
- * * `instance`        An array of nodes which are existing instances
- * * `containers`      An array of nodes of containers of instances
- * * `div`             A DOM element where UI can be displayed
- * * `statusArea`      A DOM element (opt) progress stuff can be displayed, or error messages
- * *
- * * Vocabulary:  "load" loads a file if it exists;
- * *  'Ensure" CREATES the file if it does not exist (if it can) and then loads it.
- * @packageDocumentation
- */
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+var store = _solidLogic.solidLogicSingleton.store;
 /**
  * Resolves with the logged in user's WebID
  *
  * @param context
  */
 // used to be logIn
+
 function ensureLoggedIn(context) {
   var me = _solidLogic.authn.currentUser();
 
@@ -7857,7 +7840,7 @@ function ensureLoggedIn(context) {
 // used to be logInLoadPreferences
 
 
-function ensureLoadedPreferences(_x2) {
+function ensureLoadedPreferences(_x) {
   return _ensureLoadedPreferences.apply(this, arguments);
 }
 /**
@@ -8004,14 +7987,17 @@ function _ensureLoadedPreferences() {
   return _ensureLoadedPreferences.apply(this, arguments);
 }
 
-function ensureLoadedProfile(_x3) {
+function ensureLoadedProfile(_x2) {
   return _ensureLoadedProfile.apply(this, arguments);
 }
 /**
- * Returns promise of context with arrays of symbols
- *
- * 2016-12-11 change to include forClass arc a la
- * https://github.com/solid/solid/blob/main/proposals/data-discovery.md
+  * Returns promise of context with arrays of symbols
+  *
+  * leaving the `isPublic` param undefined will bring in community index things, too
+  */
+
+/**
+ * @deprecated Since version 2.4.17 Will be deleted in version 3.0. Use solid-logic getAppInstances instead.
  */
 
 
@@ -8076,210 +8062,141 @@ function _ensureLoadedProfile() {
   return _ensureLoadedProfile.apply(this, arguments);
 }
 
-function findAppInstances(_x4, _x5, _x6) {
+function findAppInstances(_x3, _x4, _x5) {
   return _findAppInstances.apply(this, arguments);
 }
-/**
- * UI to control registration of instance
- */
-
 
 function _findAppInstances() {
   _findAppInstances = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(context, theClass, isPublic) {
-    var visibility, index, thisIndex, registrations, instances, containers, unique, e, i, cont;
+    var items;
     return _regenerator["default"].wrap(function _callee6$(_context6) {
       while (1) {
         switch (_context6.prev = _context6.next) {
           case 0:
-            unique = function _unique(arr) {
-              return Array.from(new Set(arr));
-            };
+            debug.warn('Calling deprecated function findAppInstances! Use solid-logic getAppInstances instead.');
 
-            if (!(isPublic === undefined)) {
+            if (!context.me) {
               _context6.next = 7;
               break;
             }
 
             _context6.next = 4;
-            return findAppInstances(context, theClass, true);
+            return (0, _solidLogic.getScopedAppInstances)(store, theClass, context.me);
 
           case 4:
-            _context6.next = 6;
-            return findAppInstances(context, theClass, false);
-
-          case 6:
-            return _context6.abrupt("return", context);
-
-          case 7:
-            _context6.prev = 7;
-            _context6.next = 10;
-            return isPublic ? ensureLoadedProfile(context) : ensureLoadedPreferences(context);
-
-          case 10:
-            _context6.next = 15;
-            break;
-
-          case 12:
-            _context6.prev = 12;
-            _context6.t0 = _context6["catch"](7);
-            widgets.complain(context, "loadIndex: login and load problem ".concat(_context6.t0));
-
-          case 15:
-            // console.log('awaited LogInLoad!', context)
-            visibility = isPublic ? 'public' : 'private';
-            _context6.prev = 16;
-            _context6.next = 19;
-            return (0, _solidLogic.loadIndex)(context, isPublic);
-
-          case 19:
-            _context6.next = 24;
+            _context6.t0 = _context6.sent;
+            _context6.next = 8;
             break;
 
-          case 21:
-            _context6.prev = 21;
-            _context6.t1 = _context6["catch"](16);
-            debug.error(_context6.t1);
-
-          case 24:
-            index = context.index;
-            thisIndex = index[visibility];
-            registrations = thisIndex.map(function (ix) {
-              return _solidLogic.solidLogicSingleton.store.each(undefined, ns.solid('forClass'), theClass, ix);
-            }).reduce(function (acc, curr) {
-              return acc.concat(curr);
-            }, []);
-            instances = registrations.map(function (reg) {
-              return _solidLogic.solidLogicSingleton.store.each(reg, ns.solid('instance'));
-            }).reduce(function (acc, curr) {
-              return acc.concat(curr);
-            }, []);
-            containers = registrations.map(function (reg) {
-              return _solidLogic.solidLogicSingleton.store.each(reg, ns.solid('instanceContainer'));
-            }).reduce(function (acc, curr) {
-              return acc.concat(curr);
-            }, []);
-            context.instances = context.instances || [];
-            context.instances = unique(context.instances.concat(instances));
-            context.containers = context.containers || [];
-            context.containers = unique(context.containers.concat(containers));
-
-            if (containers.length) {
-              _context6.next = 35;
-              break;
-            }
-
-            return _context6.abrupt("return", context);
-
-          case 35:
-            _context6.prev = 35;
-            _context6.next = 38;
-            return _solidLogic.solidLogicSingleton.load(containers);
-
-          case 38:
-            _context6.next = 45;
-            break;
-
-          case 40:
-            _context6.prev = 40;
-            _context6.t2 = _context6["catch"](35);
-            e = new Error("[FAI] Unable to load containers".concat(_context6.t2));
-            debug.log(e); // complain
-
-            widgets.complain(context, "Error looking for ".concat(_index.utils.label(theClass), ":  ").concat(_context6.t2)); // but then ignore it
-            // throw new Error(e)
+          case 7:
+            _context6.t0 = [];
 
-          case 45:
-            i = 0;
+          case 8:
+            items = _context6.t0;
 
-          case 46:
-            if (!(i < containers.length)) {
-              _context6.next = 56;
-              break;
+            if (isPublic === true) {
+              // old API - not recommended!
+              items = items.filter(function (item) {
+                return item.scope.label === 'public';
+              });
+            } else if (isPublic === false) {
+              items = items.filter(function (item) {
+                return item.scope.label === 'private';
+              });
             }
 
-            cont = containers[i];
-            _context6.t3 = context.instances;
-            _context6.next = 51;
-            return _solidLogic.solidLogicSingleton.getContainerMembers(cont.value);
-
-          case 51:
-            _context6.t4 = _context6.sent.map(function (uri) {
-              return _solidLogic.solidLogicSingleton.store.sym(uri);
+            context.instances = items.map(function (item) {
+              return item.instance;
             });
-            context.instances = _context6.t3.concat.call(_context6.t3, _context6.t4);
-
-          case 53:
-            i++;
-            _context6.next = 46;
-            break;
-
-          case 56:
             return _context6.abrupt("return", context);
 
-          case 57:
+          case 12:
           case "end":
             return _context6.stop();
         }
       }
-    }, _callee6, null, [[7, 12], [16, 21], [35, 40]]);
+    }, _callee6);
   }));
   return _findAppInstances.apply(this, arguments);
 }
 
-function registrationControl(_x7, _x8, _x9) {
-  return _registrationControl.apply(this, arguments);
+function scopeLabel(context, scope) {
+  var mine = context.me && context.me.sameTerm(scope.agent);
+  var name = mine ? '' : utils.label(scope.agent) + ' ';
+  return "".concat(name).concat(scope.label);
 }
 /**
- * UI to List at all registered things
+ * UI to control registration of instance
  */
 
 
+function registrationControl(_x6, _x7, _x8) {
+  return _registrationControl.apply(this, arguments);
+}
+
 function _registrationControl() {
   _registrationControl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(context, instance, theClass) {
-    var dom, box, context2, msg, tbody, form, registrationStatements, index, statements, _msg;
+    var registrationStatements, renderScopeCheckbox, dom, box, me, scopes, msg, tbody, form, _iterator, _step, scope, row;
 
     return _regenerator["default"].wrap(function _callee7$(_context7) {
       while (1) {
         switch (_context7.prev = _context7.next) {
           case 0:
+            renderScopeCheckbox = function _renderScopeCheckbox(scope) {
+              var statements = registrationStatements(scope.index);
+              var name = scopeLabel(context, scope);
+              var label = "".concat(name, " link to this ").concat(context.noun);
+              return widgets.buildCheckboxForm(context.dom, _solidLogic.solidLogicSingleton.store, label, null, statements, form, scope.index);
+            };
+
+            registrationStatements = function _registrationStatemen(index) {
+              var registrations = _solidLogic.solidLogicSingleton.getRegistrations(instance, theClass);
+
+              var reg = registrations.length ? registrations[0] : widgets.newThing(index);
+              return [(0, _rdflib.st)(reg, ns.solid('instance'), instance, index), (0, _rdflib.st)(reg, ns.solid('forClass'), theClass, index)];
+            };
+
+            /// / body of registrationControl
             dom = context.dom;
 
             if (!(!dom || !context.div)) {
-              _context7.next = 3;
+              _context7.next = 5;
               break;
             }
 
-            return _context7.abrupt("return", context);
+            throw new Error('registrationControl: need dom and div');
 
-          case 3:
+          case 5:
             box = dom.createElement('div');
             context.div.appendChild(box);
             context.me = _solidLogic.authn.currentUser(); // @@
 
-            if (context.me) {
-              _context7.next = 9;
+            me = context.me;
+
+            if (me) {
+              _context7.next = 12;
               break;
             }
 
             box.innerHTML = '<p style="margin:2em;">(Log in to save a link to this)</p>';
             return _context7.abrupt("return", context);
 
-          case 9:
-            _context7.prev = 9;
-            _context7.next = 12;
-            return (0, _solidLogic.ensureTypeIndexes)(context);
-
           case 12:
-            context2 = _context7.sent;
-            _context7.next = 19;
-            break;
+            _context7.prev = 12;
+            _context7.next = 15;
+            return (0, _solidLogic.loadAllTypeIndexes)(store, me);
 
           case 15:
-            _context7.prev = 15;
-            _context7.t0 = _context7["catch"](9);
+            scopes = _context7.sent;
+            _context7.next = 23;
+            break;
+
+          case 18:
+            _context7.prev = 18;
+            _context7.t0 = _context7["catch"](12);
 
             if (context.div && context.preferencesFileError) {
-              msg = '(Preferences not available)';
+              msg = '(Lists of stuff not available)';
               context.div.appendChild(dom.createElement('p')).textContent = msg;
             } else if (context.div) {
               msg = "registrationControl: Type indexes not available: ".concat(_context7.t0);
@@ -8287,168 +8204,201 @@ function _registrationControl() {
             }
 
             debug.log(msg);
+            return _context7.abrupt("return", context);
 
-          case 19:
-            box.innerHTML = '<table><tbody><tr></tr><tr></tr></tbody></table>'; // tbody will be inserted anyway
+          case 23:
+            box.innerHTML = '<table><tbody></tbody></table>'; // tbody will be inserted anyway
 
             box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid gray 0.05em;');
             tbody = box.children[0].children[0];
             form = new _rdflib.BlankNode(); // @@ say for now
 
-            registrationStatements = function registrationStatements(index) {
-              var registrations = _solidLogic.solidLogicSingleton.getRegistrations(instance, theClass);
-
-              var reg = registrations.length ? registrations[0] : widgets.newThing(index);
-              return [(0, _rdflib.st)(reg, ns.solid('instance'), instance, index), (0, _rdflib.st)(reg, ns.solid('forClass'), theClass, index)];
-            };
+            _iterator = _createForOfIteratorHelper(scopes);
 
             try {
-              if (context2.index && context2.index["public"] && context2.index["public"].length > 0) {
-                index = context2.index["public"][0];
-                statements = registrationStatements(index);
-                tbody.children[0].appendChild(widgets.buildCheckboxForm(context2.dom, _solidLogic.solidLogicSingleton.store, "Public link to this ".concat(context2.noun), null, statements, form, index));
+              for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                scope = _step.value;
+                row = tbody.appendChild(dom.createElement('tr'));
+                row.appendChild(renderScopeCheckbox(scope)); // @@ index
               }
-
-              if (context2.index && context2.index["private"] && context2.index["private"].length > 0) {
-                index = context2.index["private"][0];
-                statements = registrationStatements(index);
-                tbody.children[1].appendChild(widgets.buildCheckboxForm(context2.dom, _solidLogic.solidLogicSingleton.store, "Personal note of this ".concat(context2.noun), null, statements, form, index));
-              }
-            } catch (e) {
-              _msg = "registrationControl: Error making panel: ".concat(e);
-
-              if (context.div) {
-                context.div.appendChild(widgets.errorMessageBlock(context.dom, e));
-              }
-
-              debug.log(_msg);
+            } catch (err) {
+              _iterator.e(err);
+            } finally {
+              _iterator.f();
             }
 
-            return _context7.abrupt("return", context2);
+            return _context7.abrupt("return", context);
 
-          case 26:
+          case 30:
           case "end":
             return _context7.stop();
         }
       }
-    }, _callee7, null, [[9, 15]]);
+    }, _callee7, null, [[12, 18]]);
   }));
   return _registrationControl.apply(this, arguments);
 }
 
-function registrationList(_x10, _x11) {
+function renderScopeHeadingRow(context, store, scope) {
+  var backgroundColor = {
+    "private": '#fee',
+    "public": '#efe'
+  };
+  var dom = context.dom;
+  var name = scopeLabel(context, scope);
+  var row = dom.createElement('tr');
+  var cell = row.appendChild(dom.createElement('td'));
+  cell.setAttribute('colspan', '3');
+  cell.style.backgoundColor = backgroundColor[scope.label] || 'white';
+  var header = cell.appendChild(dom.createElement('h3'));
+  header.textContent = name + ' links';
+  header.style.textAlign = 'left';
+  return row;
+}
+/**
+  * UI to List at all registered things
+  */
+
+
+function registrationList(_x9, _x10) {
   return _registrationList.apply(this, arguments);
-}
+} // registrationList
+
 
 function _registrationList() {
-  _registrationList = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(context0, options) {
-    var dom, div, box;
-    return _regenerator["default"].wrap(function _callee8$(_context8) {
+  _registrationList = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(context, options) {
+    var dom, div, box, scopes, table, tbody, _iterator2, _step2, scope, headingRow, items, _iterator3, _step3, _loop;
+
+    return _regenerator["default"].wrap(function _callee9$(_context9) {
       while (1) {
-        switch (_context8.prev = _context8.next) {
+        switch (_context9.prev = _context9.next) {
           case 0:
-            dom = context0.dom;
-            div = context0.div;
+            dom = context.dom;
+            div = context.div;
             box = dom.createElement('div');
             div.appendChild(box);
-            context0.me = _solidLogic.authn.currentUser(); // @@
+            context.me = _solidLogic.authn.currentUser(); // @@
 
-            if (context0.me) {
-              _context8.next = 8;
+            if (context.me) {
+              _context9.next = 8;
               break;
             }
 
             box.innerHTML = '<p style="margin:2em;">(Log in list your stuff)</p>';
-            return _context8.abrupt("return", context0);
+            return _context9.abrupt("return", context);
 
           case 8:
-            return _context8.abrupt("return", (0, _solidLogic.ensureTypeIndexes)(context0).then(function (context) {
-              box.innerHTML = '<table><tbody></tbody></table>'; // tbody will be inserted anyway
-
-              // tbody will be inserted anyway
-              box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid #eee 0.5em;');
-              var table = box.firstChild;
-              var ix = [];
-              var sts = [];
-              var vs = ['private', 'public'];
-              vs.forEach(function (visibility) {
-                if (context.index && context.index[visibility].length > 0 && options[visibility]) {
-                  ix = ix.concat(context.index[visibility][0]);
-                  sts = sts.concat(_solidLogic.solidLogicSingleton.store.statementsMatching(undefined, ns.solid('instance'), undefined, context.index[visibility][0]));
-                }
-              });
+            _context9.next = 10;
+            return (0, _solidLogic.loadAllTypeIndexes)(store, context.me);
 
-              var _loop = function _loop(i) {
-                var statement = sts[i];
+          case 10:
+            scopes = _context9.sent;
+            // includes community indexes
+            // console.log('@@ registrationList ', scopes)
+            box.innerHTML = '<table><tbody></tbody></table>'; // tbody will be inserted anyway
 
-                if (options.type) {
-                  // now check  terms:forClass
-                  if (!_solidLogic.solidLogicSingleton.store.holds(statement.subject, ns.solid('forClass'), options.type, statement.why)) {
-                    return "continue"; // skip irrelevant ones
-                  }
-                } // const cla = statement.subject
+            box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid #eee 0.5em;');
+            table = box.firstChild;
+            tbody = table.firstChild;
+            _iterator2 = _createForOfIteratorHelper(scopes);
+            _context9.prev = 16;
 
+            _iterator2.s();
 
-                // const cla = statement.subject
-                var inst = statement.object;
-                table.appendChild(widgets.personTR(dom, ns.solid('instance'), inst, {
-                  deleteFunction: function deleteFunction(_x) {
-                    if (!_solidLogic.solidLogicSingleton.store.updater) {
-                      throw new Error('Cannot delete this, store has no updater');
+          case 18:
+            if ((_step2 = _iterator2.n()).done) {
+              _context9.next = 30;
+              break;
+            }
+
+            scope = _step2.value;
+            // need some predicate for listing/adding agents
+            headingRow = renderScopeHeadingRow(context, store, scope);
+            tbody.appendChild(headingRow);
+            _context9.next = 24;
+            return (0, _solidLogic.getScopedAppsFromIndex)(store, scope, options.type || null);
+
+          case 24:
+            items = _context9.sent;
+            // any class
+            if (items.length === 0) headingRow.style.display = 'none'; // console.log(`registrationList: @@ instance items for class ${options.type || 'undefined' }:`, items)
+
+            _iterator3 = _createForOfIteratorHelper(items);
+
+            try {
+              _loop = function _loop() {
+                var item = _step3.value;
+                var row = widgets.personTR(dom, ns.solid('instance'), item.instance, {
+                  deleteFunction: function () {
+                    var _deleteFunction = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8() {
+                      return _regenerator["default"].wrap(function _callee8$(_context8) {
+                        while (1) {
+                          switch (_context8.prev = _context8.next) {
+                            case 0:
+                              _context8.next = 2;
+                              return (0, _solidLogic.deleteTypeIndexRegistration)(store, item);
+
+                            case 2:
+                              tbody.removeChild(row);
+
+                            case 3:
+                            case "end":
+                              return _context8.stop();
+                          }
+                        }
+                      }, _callee8);
+                    }));
+
+                    function deleteFunction() {
+                      return _deleteFunction.apply(this, arguments);
                     }
 
-                    _solidLogic.solidLogicSingleton.store.updater.update([statement], [], function (uri, ok, errorBody) {
-                      if (ok) {
-                        debug.log("Removed from index: ".concat(statement.subject));
-                      } else {
-                        debug.log("Error: Cannot delete ".concat(statement, ": ").concat(errorBody));
-                      }
-                    });
-                  }
-                }));
+                    return deleteFunction;
+                  }()
+                });
+                row.children[0].style.paddingLeft = '3em';
+                tbody.appendChild(row);
               };
 
-              for (var i = 0; i < sts.length; i++) {
-                var _ret = _loop(i);
+              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                _loop();
+              }
+            } catch (err) {
+              _iterator3.e(err);
+            } finally {
+              _iterator3.f();
+            }
 
-                if (_ret === "continue") continue;
-              } // registrationList
+          case 28:
+            _context9.next = 18;
+            break;
 
-              /*
-                  //const containers = solidLogicSingleton.store.each(theClass, ns.solid('instanceContainer'));
-                  if (containers.length) {
-                  fetcher.load(containers).then(function(xhrs){
-                  for (const i=0; i<containers.length; i++) {
-                  const cont = containers[i];
-                  instances = instances.concat(solidLogicSingleton.store.each(cont, ns.ldp('contains')));
-                  }
-                  });
-                  }
-                  */
+          case 30:
+            _context9.next = 35;
+            break;
 
+          case 32:
+            _context9.prev = 32;
+            _context9.t0 = _context9["catch"](16);
 
-              // registrationList
+            _iterator2.e(_context9.t0);
 
-              /*
-                  //const containers = solidLogicSingleton.store.each(theClass, ns.solid('instanceContainer'));
-                  if (containers.length) {
-                  fetcher.load(containers).then(function(xhrs){
-                  for (const i=0; i<containers.length; i++) {
-                  const cont = containers[i];
-                  instances = instances.concat(solidLogicSingleton.store.each(cont, ns.ldp('contains')));
-                  }
-                  });
-                  }
-                  */
-              return context;
-            }));
+          case 35:
+            _context9.prev = 35;
 
-          case 9:
+            _iterator2.f();
+
+            return _context9.finish(35);
+
+          case 38:
+            return _context9.abrupt("return", context);
+
+          case 39:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
       }
-    }, _callee8);
+    }, _callee9, null, [[16, 32, 35, 38]]);
   }));
   return _registrationList.apply(this, arguments);
 }
@@ -8605,7 +8555,7 @@ function renderSignInPopup(dom) {
       }, _callee, null, [[0, 8]]);
     }));
 
-    return function loginToIssuer(_x12) {
+    return function loginToIssuer(_x11) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -8892,7 +8842,7 @@ function selectWorkspace(dom, appDetails, callbackWS) {
 
   function displayOptions(context) {
     // console.log('displayOptions!', context)
-    function makeNewWorkspace(_x13) {
+    function makeNewWorkspace(_x12) {
       return _makeNewWorkspace.apply(this, arguments);
     } // const status = ''
 
@@ -9161,77 +9111,77 @@ function getUserRoles() {
 
 
 function _getUserRoles() {
-  _getUserRoles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
+  _getUserRoles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
     var _yield$ensureLoadedPr, me, preferencesFile, preferencesFileError;
 
-    return _regenerator["default"].wrap(function _callee9$(_context9) {
+    return _regenerator["default"].wrap(function _callee10$(_context10) {
       while (1) {
-        switch (_context9.prev = _context9.next) {
+        switch (_context10.prev = _context10.next) {
           case 0:
-            _context9.prev = 0;
-            _context9.next = 3;
+            _context10.prev = 0;
+            _context10.next = 3;
             return ensureLoadedPreferences({});
 
           case 3:
-            _yield$ensureLoadedPr = _context9.sent;
+            _yield$ensureLoadedPr = _context10.sent;
             me = _yield$ensureLoadedPr.me;
             preferencesFile = _yield$ensureLoadedPr.preferencesFile;
             preferencesFileError = _yield$ensureLoadedPr.preferencesFileError;
 
             if (!(!preferencesFile || preferencesFileError)) {
-              _context9.next = 9;
+              _context10.next = 9;
               break;
             }
 
             throw new Error(preferencesFileError);
 
           case 9:
-            return _context9.abrupt("return", _solidLogic.solidLogicSingleton.store.each(me, ns.rdf('type'), null, preferencesFile.doc()));
+            return _context10.abrupt("return", _solidLogic.solidLogicSingleton.store.each(me, ns.rdf('type'), null, preferencesFile.doc()));
 
           case 12:
-            _context9.prev = 12;
-            _context9.t0 = _context9["catch"](0);
-            debug.warn('Unable to fetch your preferences - this was the error: ', _context9.t0);
+            _context10.prev = 12;
+            _context10.t0 = _context10["catch"](0);
+            debug.warn('Unable to fetch your preferences - this was the error: ', _context10.t0);
 
           case 15:
-            return _context9.abrupt("return", []);
+            return _context10.abrupt("return", []);
 
           case 16:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
       }
-    }, _callee9, null, [[0, 12]]);
+    }, _callee10, null, [[0, 12]]);
   }));
   return _getUserRoles.apply(this, arguments);
 }
 
-function filterAvailablePanes(_x14) {
+function filterAvailablePanes(_x13) {
   return _filterAvailablePanes.apply(this, arguments);
 }
 
 function _filterAvailablePanes() {
-  _filterAvailablePanes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(panes) {
+  _filterAvailablePanes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(panes) {
     var userRoles;
-    return _regenerator["default"].wrap(function _callee10$(_context10) {
+    return _regenerator["default"].wrap(function _callee11$(_context11) {
       while (1) {
-        switch (_context10.prev = _context10.next) {
+        switch (_context11.prev = _context11.next) {
           case 0:
-            _context10.next = 2;
+            _context11.next = 2;
             return getUserRoles();
 
           case 2:
-            userRoles = _context10.sent;
-            return _context10.abrupt("return", panes.filter(function (pane) {
+            userRoles = _context11.sent;
+            return _context11.abrupt("return", panes.filter(function (pane) {
               return isMatchingAudience(pane, userRoles);
             }));
 
           case 4:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
       }
-    }, _callee10);
+    }, _callee11);
   }));
   return _filterAvailablePanes.apply(this, arguments);
 }
@@ -15282,8 +15232,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2022-05-25T21:53:40Z',
-  commit: 'dc79c0e3372c8084fe393d058672af8389e9559a',
+  buildTime: '2022-06-14T10:02:44Z',
+  commit: 'e594bdfbbf66562870e6d50cfa5a1e6aaa098b65',
   npmInfo: {
     'solid-ui': '2.4.22',
     npm: '6.14.17',
@@ -15295,8 +15245,8 @@ var versionInfo = {
     modules: '83',
     napi: '8',
     nghttp2: '1.42.0',
-    node: '14.19.2',
-    openssl: '1.1.1n',
+    node: '14.19.3',
+    openssl: '1.1.1o',
     tz: '2021a3',
     unicode: '14.0',
     uv: '1.42.0',
@@ -17139,7 +17089,7 @@ function uploadFiles(fetcher, files, fileBase, imageBase, successHandler) {
 /*!******************************!*\
   !*** ./lib/widgets/error.js ***!
   \******************************/
-/***/ ((__unused_webpack_module, exports) => {
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
 
 "use strict";
 
@@ -17149,6 +17099,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.errorMessageBlock = errorMessageBlock;
 
+var _widgets = __webpack_require__(/*! ../widgets */ "./lib/widgets/index.js");
+
 /**
  * Create an error message block
  * @param dom The DOM on which dom.createElement will be called
@@ -17179,6 +17131,9 @@ function errorMessageBlock(dom, err, backgroundColor, err2) {
     div.textContent = err;
   }
 
+  div.appendChild((0, _widgets.cancelButton)(dom, function () {
+    if (div.parentNode) div.parentNode.removeChild(div);
+  })).style = 'width: 2em; height: 2em; align: right;';
   div.setAttribute('style', 'margin: 0.1em; padding: 0.5em; border: 0.05em solid gray; background-color: ' + (backgroundColor || '#fee') + '; color:black;');
   return div;
 }
@@ -17217,6 +17172,12 @@ Object.defineProperty(exports, "field", ({
     return _fieldFunction.field;
   }
 }));
+Object.defineProperty(exports, "fieldFunction", ({
+  enumerable: true,
+  get: function get() {
+    return _fieldFunction.fieldFunction;
+  }
+}));
 Object.defineProperty(exports, "fieldLabel", ({
   enumerable: true,
   get: function get() {
@@ -17242,6 +17203,12 @@ exports.makeSelectForCategory = makeSelectForCategory;
 exports.makeSelectForChoice = makeSelectForChoice;
 exports.makeSelectForNestedCategory = makeSelectForNestedCategory;
 exports.makeSelectForOptions = makeSelectForOptions;
+Object.defineProperty(exports, "mostSpecificClassURI", ({
+  enumerable: true,
+  get: function get() {
+    return _fieldFunction.mostSpecificClassURI;
+  }
+}));
 exports.newButton = newButton;
 exports.newThing = newThing;
 exports.promptForNew = promptForNew;
@@ -18262,8 +18229,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
   }
 
   var subForm = kb.any(form, ui('use')); // Optional
-
-  var follow = kb.anyJS(form, ui('follow'), null, formDoc); // data doc moves to new subject?
+  // const follow = kb.anyJS(form, ui('follow'), null, formDoc) // data doc moves to new subject?
 
   var opts = {
     form: form,
@@ -18326,14 +18292,14 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
 
   var multiSelect = kb.any(form, ui('multiselect')); // Optional
 
-  var selector; // from ui:property
-
-  var selectedOptions = kb.each(subject, property, null, dataDoc).map(function (object) {
-    return object.value;
-  });
+  var selector;
 
   rhs.refresh = function () {
-    // from ui:from + ui:property
+    // from ui:property
+    var selectedOptions = kb.each(subject, property, null, dataDoc).map(function (object) {
+      return object.value;
+    }); // from ui:from + ui:property
+
     var possibleOptions = getSelectorOptions();
     possibleOptions.push(selectedOptions);
     possibleOptions = sortByLabel(possibleOptions);
@@ -19124,7 +19090,7 @@ function makeSelectForChoice(dom, container, kb, subject, predicate, inputPossib
 
   log.debug('makeSelectForChoice: dataDoc=' + dataDoc);
 
-  function determineFitstSelectOptionText() {
+  function createDefaultSelectOptionText() {
     var firstSelectOptionText = '--- choice ---';
 
     if (predicate && !(predicate.termType === 'BlankNode')) {
@@ -19138,9 +19104,9 @@ function makeSelectForChoice(dom, container, kb, subject, predicate, inputPossib
     return firstSelectOptionText;
   }
 
-  function determinFirstSelectOption() {
+  function createDefaultSelectOption() {
     var option = dom.createElement('option');
-    option.appendChild(dom.createTextNode(determineFitstSelectOptionText()));
+    option.appendChild(dom.createTextNode(createDefaultSelectOptionText()));
     option.disabled = true;
     option.value = true;
     option.hidden = true;
@@ -19170,7 +19136,7 @@ function makeSelectForChoice(dom, container, kb, subject, predicate, inputPossib
     select.insertBefore(mint, select.firstChild);
   }
 
-  if (select.children.length === 0) select.insertBefore(determinFirstSelectOption(), select.firstChild);
+  if (select.children.length === 0) select.insertBefore(createDefaultSelectOption(), select.firstChild);
 
   select.update = function (newSelectedOptions) {
     selectedOptions = newSelectedOptions;
@@ -19179,7 +19145,7 @@ function makeSelectForChoice(dom, container, kb, subject, predicate, inputPossib
 
     var removeValue = function removeValue(t) {
       if (kb.holds(subject, predicate, t, dataDoc)) {
-        ds.push($rdf.st(subject, predicate, t, dataDoc)); // console.log("----value removed " + t)
+        ds.push($rdf.st(subject, predicate, t, dataDoc));
       }
     };
 
@@ -19276,13 +19242,13 @@ function makeSelectForChoice(dom, container, kb, subject, predicate, inputPossib
         select.currentURI = opt.AJAR_uri;
       }
 
-      if (!containsObject(opt.AJAR_uri, selectedOptions)) opt.setAttribute('selected', 'false');
+      if (!containsObject(opt.AJAR_uri, selectedOptions)) opt.removeAttribute('selected');
       if (containsObject(opt.AJAR_uri, selectedOptions)) opt.setAttribute('selected', 'true');
     }
 
     log.info('selectForOptions: data doc = ' + dataDoc);
 
-    if (select.currentURI) {
+    if (select.currentURI && options.subForm) {
       addSubFormChoice(dom, container, {}, $rdf.sym(select.currentURI), options.subForm, dataDoc, function (ok, body) {
         if (ok) {
           kb.updater.update([], is, function (uri, success, errorBody) {
@@ -19323,8 +19289,7 @@ function makeSelectForChoice(dom, container, kb, subject, predicate, inputPossib
 
     option.AJAR_uri = uri;
 
-    if (c.value === '' + select.currentURI || containsObject(c.value, selectedOptions)) {
-      option.selected = true;
+    if (containsObject(c.value, selectedOptions)) {
       option.setAttribute('selected', 'true');
     }
 
@@ -26957,31 +26922,6 @@ function freeze(object, oc) {
 	return oc && typeof oc.freeze === 'function' ? oc.freeze(object) : object
 }
 
-/**
- * Since we can not rely on `Object.assign` we provide a simplified version
- * that is sufficient for our needs.
- *
- * @param {Object} target
- * @param {Object | null | undefined} source
- *
- * @returns {Object} target
- * @throws TypeError if target is not an object
- *
- * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign
- * @see https://tc39.es/ecma262/multipage/fundamental-objects.html#sec-object.assign
- */
-function assign(target, source) {
-	if (target === null || typeof target !== 'object') {
-		throw new TypeError('target is not an object')
-	}
-	for (var key in source) {
-		if (Object.prototype.hasOwnProperty.call(source, key)) {
-			target[key] = source[key]
-		}
-	}
-	return target
-}
-
 /**
  * All mime types that are allowed as input to `DOMParser.parseFromString`
  *
@@ -27099,7 +27039,6 @@ var NAMESPACE = freeze({
 	XMLNS: 'http://www.w3.org/2000/xmlns/',
 })
 
-exports.assign = assign;
 exports.freeze = freeze;
 exports.MIME_TYPE = MIME_TYPE;
 exports.NAMESPACE = NAMESPACE;
@@ -28634,10 +28573,9 @@ function needNamespaceDefine(node, isHTML, visibleNamespaces) {
  * are serialized as their entity references, so they will be preserved.
  * (In contrast to whitespace literals in the input which are normalized to spaces)
  * @see https://www.w3.org/TR/xml11/#AVNormalize
- * @see https://w3c.github.io/DOM-Parsing/#serializing-an-element-s-attributes
  */
 function addSerializedAttribute(buf, qualifiedName, value) {
-	buf.push(' ', qualifiedName, '="', value.replace(/[<>&"\t\n\r]/g, _xmlEncoder), '"')
+	buf.push(' ', qualifiedName, '="', value.replace(/[<&"\t\n\r]/g, _xmlEncoder), '"')
 }
 
 function serializeToString(node,buf,isHTML,nodeFilter,visibleNamespaces){
@@ -28782,10 +28720,10 @@ function serializeToString(node,buf,isHTML,nodeFilter,visibleNamespaces){
 		 * and does not include the CDATA-section-close delimiter, `]]>`.
 		 *
 		 * @see https://www.w3.org/TR/xml/#NT-CharData
-		 * @see https://w3c.github.io/DOM-Parsing/#xml-serializing-a-text-node
 		 */
 		return buf.push(node.data
-			.replace(/[<&>]/g,_xmlEncoder)
+			.replace(/[<&]/g,_xmlEncoder)
+			.replace(/]]>/g, ']]&gt;')
 		);
 	case CDATA_SECTION_NODE:
 		return buf.push( '<![CDATA[',node.data,']]>');
@@ -45814,8 +45752,8 @@ class N3Parser {
   _saveContext(type, graph, subject, predicate, object) {
     const n3Mode = this._n3Mode;
     this._contextStack.push({
-      subject: subject, predicate: predicate, object: object,
-      graph: graph, type: type,
+      type,
+      subject, predicate, object, graph,
       inverse: n3Mode ? this._inversePredicate : false,
       blankPrefix: n3Mode ? this._prefixes._ : '',
       quantified: n3Mode ? this._quantified : null,
@@ -45834,14 +45772,20 @@ class N3Parser {
 
   // ### `_restoreContext` restores the parent context
   // when leaving a scope (list, blank node, formula)
-  _restoreContext() {
-    const context = this._contextStack.pop(), n3Mode = this._n3Mode;
+  _restoreContext(type, token) {
+    // Obtain the previous context
+    const context = this._contextStack.pop();
+    if (!context || context.type !== type)
+      return this._error(`Unexpected ${token.type}`, token);
+
+    // Restore the quad of the previous context
     this._subject   = context.subject;
     this._predicate = context.predicate;
     this._object    = context.object;
     this._graph     = context.graph;
-    // The settings below only apply to N3 streams
-    if (n3Mode) {
+
+    // Restore N3 context settings
+    if (this._n3Mode) {
       this._inversePredicate = context.inverse;
       this._prefixes._ = context.blankPrefix;
       this._quantified = context.quantified;
@@ -46114,7 +46058,7 @@ class N3Parser {
 
     // Restore the parent context containing this blank node
     const empty = this._predicate === null;
-    this._restoreContext();
+    this._restoreContext('blank', token);
     // If the blank node was the object, restore previous context and read punctuation
     if (this._object !== null)
       return this._getContextEndReader();
@@ -46165,7 +46109,7 @@ class N3Parser {
       break;
     case ')':
       // Closing the list; restore the parent context
-      this._restoreContext();
+      this._restoreContext('list', token);
       // If this list is contained within a parent list, return the membership quad here.
       // This will be `<parent list element> rdf:first <this list>.`.
       if (stack.length !== 0 && stack[stack.length - 1].type === 'list')
@@ -46316,7 +46260,7 @@ class N3Parser {
       this._emit(this._subject, this._predicate, this._object, this._graph);
 
     // Restore the parent context containing this formula
-    this._restoreContext();
+    this._restoreContext('formula', token);
     // If the formula was the subject, continue reading the predicate.
     // If the formula was the object, read punctuation.
     return this._object === null ? this._readPredicate : this._getContextEndReader();
@@ -46525,7 +46469,7 @@ class N3Parser {
         // The list item is the remaining subejct after reading the path
         const item = this._subject;
         // Switch back to the context of the list
-        this._restoreContext();
+        this._restoreContext('item', token);
         // Output the list item
         this._emit(this._subject, this.RDF_FIRST, item, this._graph);
       }
@@ -46587,7 +46531,7 @@ class N3Parser {
     // Read the quad and restore the previous context
     const quad = this._quad(this._subject, this._predicate, this._object,
       this._graph || this.DEFAULTGRAPH);
-    this._restoreContext();
+    this._restoreContext('<<', token);
     // If the triple was the subject, continue by reading the predicate.
     if (this._subject === null) {
       this._subject = quad;
@@ -66851,7 +66795,7 @@ var SolidAuthnLogic = /** @class */ (function () {
         if (app.viewingNoAuthPage) {
             return (0, rdflib_1.sym)(app.webId);
         }
-        if (this.session.info.webId && this.session.info.isLoggedIn) {
+        if (this && this.session && this.session.info && this.session.info.webId && this.session.info.isLoggedIn) {
             return (0, rdflib_1.sym)(this.session.info.webId);
         }
         return (0, authUtil_1.offlineTestID)(); // null unless testing
@@ -67378,6 +67322,29 @@ exports.determineChatContainer = determineChatContainer;
 
 "use strict";
 
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -67414,16 +67381,128 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.loadAllTypeIndexes = exports.loadCommunityTypeIndexes = exports.loadTypeIndexesFor = exports.loadPreferences = exports.loadProfile = void 0;
+exports.deleteTypeIndexRegistration = exports.registerInstanceInTypeIndex = exports.getAppInstances = exports.getScopedAppInstances = exports.getScopedAppsFromIndex = exports.uniqueNodes = exports.loadAllTypeIndexes = exports.loadCommunityTypeIndexes = exports.loadTypeIndexesFor = exports.loadPreferences = exports.loadProfile = exports.followOrCreateLink = exports.suggestPrivateTypeIndex = exports.suggestPublicTypeIndex = exports.suggestPreferencesFile = exports.loadOrCreateIfNotExists = void 0;
 var rdflib_1 = __webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js");
-var ns = {
-    solid: (0, rdflib_1.Namespace)('http://www.w3.org/ns/solid/terms#'),
-    space: (0, rdflib_1.Namespace)('http://www.w3.org/ns/pim/space#')
-};
+var $rdf = __importStar(__webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js"));
+var solidLogicSingleton_1 = __webpack_require__(/*! ../logic/solidLogicSingleton */ "./node_modules/solid-logic/lib/logic/solidLogicSingleton.js");
+var uri_1 = __webpack_require__(/*! ../util/uri */ "./node_modules/solid-logic/lib/util/uri.js");
+var solid_namespace_1 = __importDefault(__webpack_require__(/*! solid-namespace */ "./node_modules/solid-namespace/index.js"));
+var authn = solidLogicSingleton_1.solidLogicSingleton.authn;
+var currentUser = authn.currentUser;
+var ns = (0, solid_namespace_1.default)($rdf);
+/**
+ * Create a resource if it really does not exist
+ * Be absolutely sure something does not exist before creating a new empty file
+ * as otherwise existing could  be deleted.
+ * @param doc {NamedNode} - The resource
+ */
+function loadOrCreateIfNotExists(store, doc) {
+    return __awaiter(this, void 0, void 0, function () {
+        var response, err_1, msg, msg;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    _a.trys.push([0, 2, , 3]);
+                    return [4 /*yield*/, store.fetcher.load(doc)];
+                case 1:
+                    response = _a.sent();
+                    return [3 /*break*/, 3];
+                case 2:
+                    err_1 = _a.sent();
+                    if (err_1.response.status === 404) {
+                        try {
+                            store.fetcher.webOperation('PUT', doc, { data: '', contentType: 'text/turtle' });
+                        }
+                        catch (err) {
+                            msg = 'createIfNotExists: PUT FAILED: ' + doc + ': ' + err;
+                            throw new Error(msg);
+                        }
+                        delete store.fetcher.requested[doc.uri]; // delete cached 404 error
+                    }
+                    else {
+                        msg = 'createIfNotExists doc load error NOT 404:  ' + doc + ': ' + err_1;
+                        throw new Error(msg); // @@ add nested errors
+                    }
+                    return [3 /*break*/, 3];
+                case 3: return [2 /*return*/, response];
+            }
+        });
+    });
+}
+exports.loadOrCreateIfNotExists = loadOrCreateIfNotExists;
+function suggestPreferencesFile(me) {
+    var stripped = me.uri.replace('/profile/', '/').replace('/public/', '/');
+    // const stripped = me.uri.replace(\/[p|P]rofile/\g, '/').replace(\/[p|P]ublic/\g, '/')
+    var folderURI = stripped.split('/').slice(0, -1).join('/') + '/Settings/';
+    var fileURI = folderURI + 'Preferences.ttl';
+    return (0, rdflib_1.sym)(fileURI);
+}
+exports.suggestPreferencesFile = suggestPreferencesFile;
+function suggestPublicTypeIndex(me) {
+    var _a;
+    return (0, rdflib_1.sym)(((_a = me.doc().dir()) === null || _a === void 0 ? void 0 : _a.uri) + 'publicTypeIndex.ttl');
+}
+exports.suggestPublicTypeIndex = suggestPublicTypeIndex;
+// Note this one is based off the pref file not the profile
+function suggestPrivateTypeIndex(preferencesFile) {
+    var _a;
+    return (0, rdflib_1.sym)(((_a = preferencesFile.doc().dir()) === null || _a === void 0 ? void 0 : _a.uri) + 'privateTypeIndex.ttl');
+}
+exports.suggestPrivateTypeIndex = suggestPrivateTypeIndex;
+/* Follow link from this doc to another thing, or else make a new link
+**
+** return: null no ld one and failed to make a new one
+*/
+function followOrCreateLink(store, subject, predicate, object, doc) {
+    return __awaiter(this, void 0, void 0, function () {
+        var result, err_2, err_3;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, store.fetcher.load(doc)];
+                case 1:
+                    _a.sent();
+                    result = store.any(subject, predicate, null, doc);
+                    if (result)
+                        return [2 /*return*/, result];
+                    if (!store.updater.editable(doc)) {
+                        return [2 /*return*/, null];
+                    }
+                    _a.label = 2;
+                case 2:
+                    _a.trys.push([2, 4, , 5]);
+                    return [4 /*yield*/, store.updater.update([], [(0, rdflib_1.st)(subject, predicate, object, doc)])];
+                case 3:
+                    _a.sent();
+                    return [3 /*break*/, 5];
+                case 4:
+                    err_2 = _a.sent();
+                    console.warn("followOrCreateLink: Error making link in ".concat(doc, " to ").concat(object, ": ").concat(err_2));
+                    return [2 /*return*/, null];
+                case 5:
+                    _a.trys.push([5, 7, , 8]);
+                    return [4 /*yield*/, loadOrCreateIfNotExists(store, object)
+                        // store.fetcher.webOperation('PUT', object, { data: '', contentType: 'text/turtle'})
+                    ];
+                case 6:
+                    _a.sent();
+                    return [3 /*break*/, 8];
+                case 7:
+                    err_3 = _a.sent();
+                    console.warn("followOrCreateLink: Error loading or saving new linked document: ".concat(object, ": ").concat(err_3));
+                    return [3 /*break*/, 8];
+                case 8: return [2 /*return*/, object];
+            }
+        });
+    });
+}
+exports.followOrCreateLink = followOrCreateLink;
 function loadProfile(store, user) {
     return __awaiter(this, void 0, void 0, function () {
-        var err_1;
+        var err_4;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -67438,8 +67517,8 @@ function loadProfile(store, user) {
                     _a.sent();
                     return [3 /*break*/, 4];
                 case 3:
-                    err_1 = _a.sent();
-                    throw new Error("Unable to load profile of user <".concat(user, ">: ").concat(err_1));
+                    err_4 = _a.sent();
+                    throw new Error("Unable to load profile of user ".concat(user, ": ").concat(err_4));
                 case 4: return [2 /*return*/, user.doc()];
             }
         });
@@ -67448,27 +67527,32 @@ function loadProfile(store, user) {
 exports.loadProfile = loadProfile;
 function loadPreferences(store, user) {
     return __awaiter(this, void 0, void 0, function () {
-        var profile, preferencesFile;
+        var possiblePreferencesFile, preferencesFile, message, err_5;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, loadProfile(store, user)];
                 case 1:
-                    profile = _a.sent();
-                    preferencesFile = store.any(user, ns.space('preferencesFile'), undefined, profile);
+                    _a.sent();
+                    possiblePreferencesFile = suggestPreferencesFile(user);
+                    return [4 /*yield*/, followOrCreateLink(store, user, ns.space('preferencesFile'), possiblePreferencesFile, user.doc())];
+                case 2:
+                    preferencesFile = _a.sent();
                     if (!preferencesFile) {
-                        // throw new Error(`USer ${user} has no pointer in profile to preferences file.`)
+                        message = "User ".concat(user, " has no pointer in profile to preferences file.");
+                        console.warn(message);
                         return [2 /*return*/, undefined];
                     }
-                    try {
-                        store.fetcher.load(preferencesFile);
-                    }
-                    catch (err) { // Mabeb a permission propblem or origin problem
-                        return [2 /*return*/, undefined
-                            // throw new Error(`Unable to load preferences file ${preferencesFile} of user <${user}>: ${err}`)
-                        ];
-                        // throw new Error(`Unable to load preferences file ${preferencesFile} of user <${user}>: ${err}`)
-                    }
-                    return [2 /*return*/, preferencesFile];
+                    _a.label = 3;
+                case 3:
+                    _a.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, store.fetcher.load(preferencesFile)];
+                case 4:
+                    _a.sent();
+                    return [3 /*break*/, 6];
+                case 5:
+                    err_5 = _a.sent();
+                    return [2 /*return*/, undefined];
+                case 6: return [2 /*return*/, preferencesFile];
             }
         });
     });
@@ -67476,7 +67560,7 @@ function loadPreferences(store, user) {
 exports.loadPreferences = loadPreferences;
 function loadTypeIndexesFor(store, user) {
     return __awaiter(this, void 0, void 0, function () {
-        var profile, publicTypeIndex, _a, pub, preferencesFile, privateTypeIndexes, priv;
+        var profile, suggestion, publicTypeIndex, publicScopes, preferencesFile, err_6, privateScopes, suggestedPrivateTypeIndex, privateTypeIndex, _a, scopes, files, err_7;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
@@ -67485,30 +67569,55 @@ function loadTypeIndexesFor(store, user) {
                     return [4 /*yield*/, loadProfile(store, user)];
                 case 1:
                     profile = _b.sent();
-                    publicTypeIndex = store.any(user, ns.solid('publicTypeIndex'), undefined, profile);
-                    if (!publicTypeIndex) return [3 /*break*/, 5];
-                    _b.label = 2;
+                    suggestion = suggestPublicTypeIndex(user);
+                    return [4 /*yield*/, followOrCreateLink(store, user, ns.solid('publicTypeIndex'), suggestion, profile)];
                 case 2:
-                    _b.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, store.fetcher.load(publicTypeIndex)];
+                    publicTypeIndex = _b.sent();
+                    publicScopes = publicTypeIndex ? [{ label: 'public', index: publicTypeIndex, agent: user }] : [];
+                    _b.label = 3;
                 case 3:
-                    _b.sent();
-                    return [3 /*break*/, 5];
+                    _b.trys.push([3, 5, , 6]);
+                    return [4 /*yield*/, loadPreferences(store, user)];
                 case 4:
-                    _a = _b.sent();
-                    return [3 /*break*/, 5];
+                    preferencesFile = _b.sent();
+                    return [3 /*break*/, 6];
                 case 5:
-                    pub = publicTypeIndex ? [{ label: 'public', index: publicTypeIndex, agent: user }] : [];
-                    return [4 /*yield*/, loadPreferences(store, user)];
+                    err_6 = _b.sent();
+                    preferencesFile = null;
+                    return [3 /*break*/, 6];
                 case 6:
-                    preferencesFile = _b.sent();
-                    if (preferencesFile) { // watch out - can be in either as spec was not clear
-                        privateTypeIndexes = store.each(user, ns.solid('privateTypeIndex'), undefined, preferencesFile)
-                            .concat(store.each(user, ns.solid('privateTypeIndex'), undefined, profile));
-                        priv = privateTypeIndexes.length > 0 ? [{ label: 'priSo @@@@@vate', index: privateTypeIndexes[0], agent: user }] : [];
-                        return [2 /*return*/, pub.concat(priv)];
-                    }
-                    return [2 /*return*/, pub];
+                    if (!preferencesFile) return [3 /*break*/, 9];
+                    suggestedPrivateTypeIndex = suggestPrivateTypeIndex(preferencesFile);
+                    _a = store.any(user, ns.solid('privateTypeIndex'), undefined, profile);
+                    if (_a) return [3 /*break*/, 8];
+                    return [4 /*yield*/, followOrCreateLink(store, user, ns.solid('privateTypeIndex'), suggestedPrivateTypeIndex, preferencesFile)];
+                case 7:
+                    _a = (_b.sent());
+                    _b.label = 8;
+                case 8:
+                    privateTypeIndex = _a;
+                    privateScopes = privateTypeIndex ? [{ label: 'private', index: privateTypeIndex, agent: user }] : [];
+                    return [3 /*break*/, 10];
+                case 9:
+                    privateScopes = [];
+                    _b.label = 10;
+                case 10:
+                    scopes = publicScopes.concat(privateScopes);
+                    if (scopes.length === 0)
+                        return [2 /*return*/, scopes];
+                    files = scopes.map(function (scope) { return scope.index; });
+                    _b.label = 11;
+                case 11:
+                    _b.trys.push([11, 13, , 14]);
+                    return [4 /*yield*/, store.fetcher.load(files)];
+                case 12:
+                    _b.sent();
+                    return [3 /*break*/, 14];
+                case 13:
+                    err_7 = _b.sent();
+                    console.warn('Problems loading type index: ', err_7);
+                    return [3 /*break*/, 14];
+                case 14: return [2 /*return*/, scopes];
             }
         });
     });
@@ -67516,44 +67625,30 @@ function loadTypeIndexesFor(store, user) {
 exports.loadTypeIndexesFor = loadTypeIndexesFor;
 function loadCommunityTypeIndexes(store, user) {
     return __awaiter(this, void 0, void 0, function () {
-        var preferencesFile, communities, communityTypeIndexesPromise, result1;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var preferencesFile, communities, result, _i, communities_1, org, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
                 case 0: return [4 /*yield*/, loadPreferences(store, user)];
                 case 1:
-                    preferencesFile = _a.sent();
-                    if (preferencesFile) {
-                        communities = store.each(user, ns.solid('community'), undefined, preferencesFile);
-                        communityTypeIndexesPromise = communities.map(function (community) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, loadTypeIndexesFor(store, community)];
-                                case 1: return [2 /*return*/, _a.sent()];
-                            }
-                        }); }); });
-                        result1 = Promise.all(communityTypeIndexesPromise);
-                        // const result2 = Promise.all(result1)
-                        // const flat = result2.flat()
-                        return [2 /*return*/, result1
-                            // const communityTypeIndexes = await Promise.all(communityTypeIndexesPromise)
-                            /*
-                          let result = [] as TypeIndex[]
-                          for(const community of communities) {
-                            result = result.concat(await loadTypeIndexesFor(store, community as NamedNode)) as TypeIndex[] // @@ how oto make functional with async?
-                          }
-                          */
-                            // return communityTypeIndexesPromise.resolve()
-                        ];
-                        // const communityTypeIndexes = await Promise.all(communityTypeIndexesPromise)
-                        /*
-                      let result = [] as TypeIndex[]
-                      for(const community of communities) {
-                        result = result.concat(await loadTypeIndexesFor(store, community as NamedNode)) as TypeIndex[] // @@ how oto make functional with async?
-                      }
-                      */
-                        // return communityTypeIndexesPromise.resolve()
-                    }
-                    return [2 /*return*/, []];
+                    preferencesFile = _c.sent();
+                    if (!preferencesFile) return [3 /*break*/, 6];
+                    communities = store.each(user, ns.solid('community'), undefined, preferencesFile).concat(store.each(user, ns.solid('community'), undefined, user.doc()));
+                    result = [];
+                    _i = 0, communities_1 = communities;
+                    _c.label = 2;
+                case 2:
+                    if (!(_i < communities_1.length)) return [3 /*break*/, 5];
+                    org = communities_1[_i];
+                    _b = (_a = result).concat;
+                    return [4 /*yield*/, loadTypeIndexesFor(store, org)];
+                case 3:
+                    result = _b.apply(_a, [_c.sent()]);
+                    _c.label = 4;
+                case 4:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 5: return [2 /*return*/, result];
+                case 6: return [2 /*return*/, []]; // No communities
             }
         });
     });
@@ -67574,11 +67669,159 @@ function loadAllTypeIndexes(store, user) {
     });
 }
 exports.loadAllTypeIndexes = loadAllTypeIndexes;
+// Utility: remove duplicates from Array of NamedNodes
+function uniqueNodes(arr) {
+    var uris = arr.map(function (x) { return x.uri; });
+    var set = new Set(uris);
+    var uris2 = Array.from(set);
+    var arr2 = uris2.map(function (u) { return new rdflib_1.NamedNode(u); });
+    return arr2; // Array.from(new Set(arr.map(x => x.uri))).map(u => sym(u))
+}
+exports.uniqueNodes = uniqueNodes;
+function getScopedAppsFromIndex(store, scope, theClass) {
+    return __awaiter(this, void 0, void 0, function () {
+        var index, registrations, relevant, directInstances, instances, instanceContainers, containers, i, cont, contents;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    index = scope.index;
+                    registrations = store.statementsMatching(null, ns.solid('instance'), null, index)
+                        .concat(store.statementsMatching(null, ns.solid('instanceContainer'), null, index))
+                        .map(function (st) { return st.subject; });
+                    relevant = theClass ? registrations.filter(function (reg) { return store.any(reg, ns.solid('forClass'), null, index).sameTerm(theClass); })
+                        : registrations;
+                    directInstances = relevant.map(function (reg) { return store.each(reg, ns.solid('instance'), null, index); }).flat();
+                    instances = uniqueNodes(directInstances);
+                    instanceContainers = relevant.map(function (reg) { return store.each(reg, ns.solid('instanceContainer'), null, index); }).flat();
+                    containers = uniqueNodes(instanceContainers);
+                    if (containers.length > 0) {
+                        console.log('@@ getScopedAppsFromIndex containers ', containers);
+                    }
+                    i = 0;
+                    _a.label = 1;
+                case 1:
+                    if (!(i < containers.length)) return [3 /*break*/, 4];
+                    cont = containers[i];
+                    return [4 /*yield*/, store.fetcher.load(cont)];
+                case 2:
+                    _a.sent();
+                    contents = store.each(cont, ns.ldp('contains'), null, cont);
+                    instances = instances.concat(contents);
+                    _a.label = 3;
+                case 3:
+                    i++;
+                    return [3 /*break*/, 1];
+                case 4: return [2 /*return*/, instances.map(function (instance) { return { instance: instance, scope: scope }; })];
+            }
+        });
+    });
+}
+exports.getScopedAppsFromIndex = getScopedAppsFromIndex;
+function getScopedAppInstances(store, klass, user) {
+    return __awaiter(this, void 0, void 0, function () {
+        var scopes, scopedApps, _i, scopes_1, scope, scopedApps0;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, loadAllTypeIndexes(store, user)];
+                case 1:
+                    scopes = _a.sent();
+                    scopedApps = [];
+                    _i = 0, scopes_1 = scopes;
+                    _a.label = 2;
+                case 2:
+                    if (!(_i < scopes_1.length)) return [3 /*break*/, 5];
+                    scope = scopes_1[_i];
+                    return [4 /*yield*/, getScopedAppsFromIndex(store, scope, klass)];
+                case 3:
+                    scopedApps0 = _a.sent();
+                    scopedApps = scopedApps.concat(scopedApps0);
+                    _a.label = 4;
+                case 4:
+                    _i++;
+                    return [3 /*break*/, 2];
+                case 5: return [2 /*return*/, scopedApps];
+            }
+        });
+    });
+}
+exports.getScopedAppInstances = getScopedAppInstances;
+// This is the function signature which used to be in solid-ui/logic
+// Recommended to use getScopedAppInstances instead as it provides more information.
+//
+function getAppInstances(store, klass) {
+    return __awaiter(this, void 0, void 0, function () {
+        var user, scopedAppInstances;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    user = currentUser();
+                    if (!user)
+                        throw new Error('getAppInstances: Must be logged in to find apps.');
+                    return [4 /*yield*/, getScopedAppInstances(store, klass, user)];
+                case 1:
+                    scopedAppInstances = _a.sent();
+                    return [2 /*return*/, scopedAppInstances.map(function (scoped) { return scoped.instance; })];
+            }
+        });
+    });
+}
+exports.getAppInstances = getAppInstances;
 /*
-export async function getAppInstances (store:LiveStore, klass: NamedNode) {
-
+ * Register a new app in a type index
+ * used in chat in bookmark.js (solid-ui)
+ * Returns the registration object if successful else null
+ */
+function registerInstanceInTypeIndex(store, instance, index, theClass) {
+    return __awaiter(this, void 0, void 0, function () {
+        var registration, ins, err_8, msg;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    registration = (0, uri_1.newThing)(index);
+                    ins = [
+                        // See https://github.com/solid/solid/blob/main/proposals/data-discovery.md
+                        (0, rdflib_1.st)(registration, ns.rdf('type'), ns.solid('TypeRegistration'), index),
+                        (0, rdflib_1.st)(registration, ns.solid('forClass'), theClass, index),
+                        (0, rdflib_1.st)(registration, ns.solid('instance'), instance, index)
+                    ];
+                    _a.label = 1;
+                case 1:
+                    _a.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, store.updater.update([], ins)];
+                case 2:
+                    _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    err_8 = _a.sent();
+                    msg = "Unable to register ".concat(instance, " in index ").concat(index, ": ").concat(err_8);
+                    console.warn(msg);
+                    return [2 /*return*/, null];
+                case 4: return [2 /*return*/, registration];
+            }
+        });
+    });
 }
-*/
+exports.registerInstanceInTypeIndex = registerInstanceInTypeIndex;
+function deleteTypeIndexRegistration(store, item) {
+    return __awaiter(this, void 0, void 0, function () {
+        var reg, statements;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    reg = store.the(null, ns.solid('instance'), item.instance, item.scope.index);
+                    if (!reg)
+                        throw new Error("deleteTypeIndexRegistration: No registration found for ".concat(item.instance));
+                    statements = store.statementsMatching(reg, null, null, item.scope.index);
+                    return [4 /*yield*/, store.updater.update(statements, [])];
+                case 1:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.deleteTypeIndexRegistration = deleteTypeIndexRegistration;
+// ENDS
 //# sourceMappingURL=discoveryLogic.js.map
 
 /***/ }),
@@ -67592,7 +67835,7 @@ export async function getAppInstances (store:LiveStore, klass: NamedNode) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.profile = exports.chat = exports.store = exports.authSession = exports.authn = exports.FetchError = exports.NotFoundError = exports.SameOriginForbiddenError = exports.CrossOriginForbiddenError = exports.UnauthorizedError = exports.solidLogicSingleton = exports.getSuggestedIssuers = exports.ACL_LINK = exports.appContext = exports.offlineTestID = exports.SolidLogic = exports.loadAllTypeIndexes = exports.loadCommunityTypeIndexes = exports.loadTypeIndexesFor = exports.loadPreferences = exports.loadProfile = exports.loadIndex = exports.registerInTypeIndex = exports.loadTypeIndexes = exports.ensureTypeIndexes = exports.genACLText = exports.setACLUserPublic = void 0;
+exports.profile = exports.chat = exports.store = exports.authSession = exports.authn = exports.FetchError = exports.NotFoundError = exports.SameOriginForbiddenError = exports.CrossOriginForbiddenError = exports.UnauthorizedError = exports.solidLogicSingleton = exports.getSuggestedIssuers = exports.ACL_LINK = exports.appContext = exports.offlineTestID = exports.SolidLogic = exports.uniqueNodes = exports.suggestPublicTypeIndex = exports.suggestPrivateTypeIndex = exports.suggestPreferencesFile = exports.registerInstanceInTypeIndex = exports.loadTypeIndexesFor = exports.loadProfile = exports.loadPreferences = exports.loadOrCreateIfNotExists = exports.loadCommunityTypeIndexes = exports.loadAllTypeIndexes = exports.getScopedAppsFromIndex = exports.getScopedAppInstances = exports.getAppInstances = exports.followOrCreateLink = exports.deleteTypeIndexRegistration = exports.loadIndex = exports.registerInTypeIndex = exports.loadTypeIndexes = exports.ensureTypeIndexes = exports.genACLText = exports.setACLUserPublic = void 0;
 // Make these variables directly accessible as it is what you need most of the time
 // This also makes these variable globaly accesible in mashlib
 var solidLogicSingleton_1 = __webpack_require__(/*! ./logic/solidLogicSingleton */ "./node_modules/solid-logic/lib/logic/solidLogicSingleton.js");
@@ -67614,12 +67857,25 @@ Object.defineProperty(exports, "ensureTypeIndexes", ({ enumerable: true, get: fu
 Object.defineProperty(exports, "loadTypeIndexes", ({ enumerable: true, get: function () { return typeIndexLogic_1.loadTypeIndexes; } }));
 Object.defineProperty(exports, "registerInTypeIndex", ({ enumerable: true, get: function () { return typeIndexLogic_1.registerInTypeIndex; } }));
 Object.defineProperty(exports, "loadIndex", ({ enumerable: true, get: function () { return typeIndexLogic_1.loadIndex; } }));
+// Generate by
+//  grep export src/discovery/discoveryLogic.ts | sed -e 's/export //g'  | sed -e 's/async //g'| sed -e 's/function //g' | sed -e 's/ .*/,/g' | sort
 var discoveryLogic_1 = __webpack_require__(/*! ./discovery/discoveryLogic */ "./node_modules/solid-logic/lib/discovery/discoveryLogic.js");
-Object.defineProperty(exports, "loadProfile", ({ enumerable: true, get: function () { return discoveryLogic_1.loadProfile; } }));
+Object.defineProperty(exports, "deleteTypeIndexRegistration", ({ enumerable: true, get: function () { return discoveryLogic_1.deleteTypeIndexRegistration; } }));
+Object.defineProperty(exports, "followOrCreateLink", ({ enumerable: true, get: function () { return discoveryLogic_1.followOrCreateLink; } }));
+Object.defineProperty(exports, "getAppInstances", ({ enumerable: true, get: function () { return discoveryLogic_1.getAppInstances; } }));
+Object.defineProperty(exports, "getScopedAppInstances", ({ enumerable: true, get: function () { return discoveryLogic_1.getScopedAppInstances; } }));
+Object.defineProperty(exports, "getScopedAppsFromIndex", ({ enumerable: true, get: function () { return discoveryLogic_1.getScopedAppsFromIndex; } }));
+Object.defineProperty(exports, "loadAllTypeIndexes", ({ enumerable: true, get: function () { return discoveryLogic_1.loadAllTypeIndexes; } }));
+Object.defineProperty(exports, "loadCommunityTypeIndexes", ({ enumerable: true, get: function () { return discoveryLogic_1.loadCommunityTypeIndexes; } }));
+Object.defineProperty(exports, "loadOrCreateIfNotExists", ({ enumerable: true, get: function () { return discoveryLogic_1.loadOrCreateIfNotExists; } }));
 Object.defineProperty(exports, "loadPreferences", ({ enumerable: true, get: function () { return discoveryLogic_1.loadPreferences; } }));
+Object.defineProperty(exports, "loadProfile", ({ enumerable: true, get: function () { return discoveryLogic_1.loadProfile; } }));
 Object.defineProperty(exports, "loadTypeIndexesFor", ({ enumerable: true, get: function () { return discoveryLogic_1.loadTypeIndexesFor; } }));
-Object.defineProperty(exports, "loadCommunityTypeIndexes", ({ enumerable: true, get: function () { return discoveryLogic_1.loadCommunityTypeIndexes; } }));
-Object.defineProperty(exports, "loadAllTypeIndexes", ({ enumerable: true, get: function () { return discoveryLogic_1.loadAllTypeIndexes; } }));
+Object.defineProperty(exports, "registerInstanceInTypeIndex", ({ enumerable: true, get: function () { return discoveryLogic_1.registerInstanceInTypeIndex; } }));
+Object.defineProperty(exports, "suggestPreferencesFile", ({ enumerable: true, get: function () { return discoveryLogic_1.suggestPreferencesFile; } }));
+Object.defineProperty(exports, "suggestPrivateTypeIndex", ({ enumerable: true, get: function () { return discoveryLogic_1.suggestPrivateTypeIndex; } }));
+Object.defineProperty(exports, "suggestPublicTypeIndex", ({ enumerable: true, get: function () { return discoveryLogic_1.suggestPublicTypeIndex; } }));
+Object.defineProperty(exports, "uniqueNodes", ({ enumerable: true, get: function () { return discoveryLogic_1.uniqueNodes; } }));
 var SolidLogic_1 = __webpack_require__(/*! ./logic/SolidLogic */ "./node_modules/solid-logic/lib/logic/SolidLogic.js");
 Object.defineProperty(exports, "SolidLogic", ({ enumerable: true, get: function () { return SolidLogic_1.SolidLogic; } }));
 var authUtil_1 = __webpack_require__(/*! ./authn/authUtil */ "./node_modules/solid-logic/lib/authn/authUtil.js");
@@ -78108,9 +78364,8 @@ class LocalJWKSet {
     }
     async getKey(protectedHeader, token) {
         const { alg, kid } = { ...protectedHeader, ...token.header };
-        const kty = getKtyFromAlg(alg);
         const candidates = this._jwks.keys.filter((jwk) => {
-            let candidate = kty === jwk.kty;
+            let candidate = jwk.kty === getKtyFromAlg(alg);
             if (candidate && typeof kid === 'string') {
                 candidate = kid === jwk.kid;
             }
@@ -79327,15 +79582,21 @@ function lengthAndInput(input) {
 }
 async function concatKdf(secret, bits, value) {
     const iterations = Math.ceil((bits >> 3) / 32);
-    const res = new Uint8Array(iterations * 32);
-    for (let iter = 0; iter < iterations; iter++) {
+    let res;
+    for (let iter = 1; iter <= iterations; iter++) {
         const buf = new Uint8Array(4 + secret.length + value.length);
-        buf.set(uint32be(iter + 1));
+        buf.set(uint32be(iter));
         buf.set(secret, 4);
         buf.set(value, 4 + secret.length);
-        res.set(await (0,_runtime_digest_js__WEBPACK_IMPORTED_MODULE_0__["default"])('sha256', buf), iter * 32);
+        if (!res) {
+            res = await (0,_runtime_digest_js__WEBPACK_IMPORTED_MODULE_0__["default"])('sha256', buf);
+        }
+        else {
+            res = concat(res, await (0,_runtime_digest_js__WEBPACK_IMPORTED_MODULE_0__["default"])('sha256', buf));
+        }
     }
-    return res.slice(0, bits >> 3);
+    res = res.slice(0, bits >> 3);
+    return res;
 }
 
 
@@ -80550,12 +80811,9 @@ const encode = (input) => {
     return encodeBase64(input).replace(/=/g, '').replace(/\+/g, '-').replace(/\//g, '_');
 };
 const decodeBase64 = (encoded) => {
-    const binary = atob(encoded);
-    const bytes = new Uint8Array(binary.length);
-    for (let i = 0; i < binary.length; i++) {
-        bytes[i] = binary.charCodeAt(i);
-    }
-    return bytes;
+    return new Uint8Array(atob(encoded)
+        .split('')
+        .map((c) => c.charCodeAt(0)));
 };
 const decode = (input) => {
     let encoded = input;