solid-ui 2.4.14-alpha → 2.4.14-bbf45639-aade069c

package/lib/authn/authn.js

@@ -1,73 +1,65 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (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 _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _typeof = require("@babel/runtime/helpers/typeof");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.filterAvailablePanes = exports.getUserRoles = exports.newAppInstance = exports.selectWorkspace = exports.loginStatusBox = exports.checkUser = exports.renderSignInPopup = exports.offlineTestID = exports.setACLUserPublic = exports.registrationList = exports.registrationControl = exports.registerInTypeIndex = exports.findAppInstances = exports.loadTypeIndexes = exports.logInLoadPreferences = exports.logInLoadProfile = exports.logIn = exports.currentUser = exports.defaultTestUser = exports.saveUser = exports.findOriginOwner = exports.authSession = void 0;
+exports.authSession = void 0;
+exports.checkUser = checkUser;
+exports.currentUser = currentUser;
+exports.defaultTestUser = defaultTestUser;
+exports.filterAvailablePanes = filterAvailablePanes;
+exports.findAppInstances = findAppInstances;
+exports.findOriginOwner = findOriginOwner;
+exports.getUserRoles = getUserRoles;
+exports.loadTypeIndexes = loadTypeIndexes;
+exports.logIn = logIn;
+exports.logInLoadPreferences = logInLoadPreferences;
+exports.logInLoadProfile = logInLoadProfile;
+exports.loginStatusBox = loginStatusBox;
+exports.newAppInstance = newAppInstance;
+exports.offlineTestID = offlineTestID;
+exports.registerInTypeIndex = registerInTypeIndex;
+exports.registrationControl = registrationControl;
+exports.registrationList = registrationList;
+exports.renderSignInPopup = renderSignInPopup;
+exports.saveUser = saveUser;
+exports.selectWorkspace = selectWorkspace;
+exports.setACLUserPublic = setACLUserPublic;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _rdflib = require("rdflib");
+
+var _signup = require("./signup");
+
+var widgets = _interopRequireWildcard(require("../widgets"));
+
+var ns = _interopRequireWildcard(require("../ns.js"));
+
+var utils = _interopRequireWildcard(require("../utils"));
+
+var _log = require("../log");
+
+var _authSession = _interopRequireDefault(require("./authSession"));
+
+var debug = _interopRequireWildcard(require("../debug"));
+
+var _style = require("../style");
+
+var _logic = require("../logic");
+
+var _solidLogic = require("solid-logic");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+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; }
+
 /**
  * Signing in, signing up, profile and preferences reloading
  * Type index management
@@ -89,53 +81,38 @@ exports.filterAvailablePanes = exports.getUserRoles = exports.newAppInstance = e
  * * `statusArea`      A DOM element (opt) progress stuff can be displayed, or error messages
  * @packageDocumentation
  */
-var rdflib_1 = require("rdflib");
-var signup_1 = require("./signup");
-var widgets = __importStar(require("../widgets"));
-var ns = __importStar(require("../ns.js"));
-var utils = __importStar(require("../utils"));
-var log_1 = require("../log");
-var authSession_1 = __importDefault(require("./authSession"));
-var debug = __importStar(require("../debug"));
-var style_1 = require("../style");
-var logic_1 = require("../logic");
-var solid_logic_1 = require("solid-logic");
+
 /* global confirm */
-exports.authSession = authSession_1.default;
-var DEFAULT_ISSUERS = [
-    {
-        name: 'Solid Community',
-        uri: 'https://solidcommunity.net'
-    },
-    {
-        name: 'Solid Web',
-        uri: 'https://solidweb.org'
-    },
-    {
-        name: 'Inrupt.net',
-        uri: 'https://inrupt.net'
-    },
-    {
-        name: 'pod.Inrupt.com',
-        uri: 'https://broker.pod.inrupt.com'
-    }
-];
-// const userCheckSite = 'https://databox.me/'
+var authSession = _authSession["default"];
+exports.authSession = authSession;
+var DEFAULT_ISSUERS = [{
+  name: 'Solid Community',
+  uri: 'https://solidcommunity.net'
+}, {
+  name: 'Solid Web',
+  uri: 'https://solidweb.org'
+}, {
+  name: 'Inrupt.net',
+  uri: 'https://inrupt.net'
+}, {
+  name: 'pod.Inrupt.com',
+  uri: 'https://broker.pod.inrupt.com'
+}]; // const userCheckSite = 'https://databox.me/'
+
 /**
  * Look for and load the User who has control over it
  */
+
 function findOriginOwner(doc) {
-    var uri = (typeof doc === 'string') ? doc : doc.uri;
-    var i = uri.indexOf('://');
-    if (i < 0)
-        return false;
-    var j = uri.indexOf('/', i + 3);
-    if (j < 0)
-        return false;
-    var origin = uri.slice(0, j + 1); // @@ TBC
-    return origin;
+  var uri = typeof doc === 'string' ? doc : doc.uri;
+  var i = uri.indexOf('://');
+  if (i < 0) return false;
+  var j = uri.indexOf('/', i + 3);
+  if (j < 0) return false;
+  var origin = uri.slice(0, j + 1); // @@ TBC
+
+  return origin;
 }
-exports.findOriginOwner = findOriginOwner;
 /**
  * Saves `webId` in `context.me`
  * @param webId
@@ -143,110 +120,136 @@ exports.findOriginOwner = findOriginOwner;
  *
  * @returns Returns the WebID, after setting it
  */
+
+
 function saveUser(webId, context) {
-    // @@ TODO Remove the need for having context as output argument
-    var webIdUri;
-    if (webId) {
-        webIdUri = (typeof webId === 'string') ? webId : webId.uri;
-        var me = (0, rdflib_1.namedNode)(webIdUri);
-        if (context) {
-            context.me = me;
-        }
-        return me;
+  // @@ TODO Remove the need for having context as output argument
+  var webIdUri;
+
+  if (webId) {
+    webIdUri = typeof webId === 'string' ? webId : webId.uri;
+    var me = (0, _rdflib.namedNode)(webIdUri);
+
+    if (context) {
+      context.me = me;
     }
-    return null;
+
+    return me;
+  }
+
+  return null;
 }
-exports.saveUser = saveUser;
 /**
  * Wrapper around [[offlineTestID]]
  * @returns {NamedNode|null}
  */
+
+
 function defaultTestUser() {
-    // Check for offline override
-    var offlineId = offlineTestID();
-    if (offlineId) {
-        return offlineId;
-    }
-    return null;
+  // Check for offline override
+  var offlineId = offlineTestID();
+
+  if (offlineId) {
+    return offlineId;
+  }
+
+  return null;
 }
-exports.defaultTestUser = defaultTestUser;
 /**
  * find a user or app's context as set in window.SolidAppContext
  * @return {any} - an appContext object
  */
+
+
 function appContext() {
-    var SolidAppContext = window.SolidAppContext;
-    SolidAppContext || (SolidAppContext = {});
-    SolidAppContext.viewingNoAuthPage = false;
-    if (SolidAppContext.noAuth && window.document) {
-        var currentPage = window.document.location.href;
-        if (currentPage.startsWith(SolidAppContext.noAuth)) {
-            SolidAppContext.viewingNoAuthPage = true;
-            var params = new URLSearchParams(window.document.location.search);
-            if (params) {
-                var viewedPage = SolidAppContext.viewedPage = params.get('uri') || null;
-                if (viewedPage) {
-                    viewedPage = decodeURI(viewedPage);
-                    if (!viewedPage.startsWith(SolidAppContext.noAuth)) {
-                        var ary = viewedPage.split(/\//);
-                        SolidAppContext.idp = ary[0] + '//' + ary[2];
-                        SolidAppContext.viewingNoAuthPage = false;
-                    }
-                }
-            }
+  var _window = window,
+      SolidAppContext = _window.SolidAppContext;
+  SolidAppContext || (SolidAppContext = {});
+  SolidAppContext.viewingNoAuthPage = false;
+
+  if (SolidAppContext.noAuth && window.document) {
+    var currentPage = window.document.location.href;
+
+    if (currentPage.startsWith(SolidAppContext.noAuth)) {
+      SolidAppContext.viewingNoAuthPage = true;
+      var params = new URLSearchParams(window.document.location.search);
+
+      if (params) {
+        var viewedPage = SolidAppContext.viewedPage = params.get('uri') || null;
+
+        if (viewedPage) {
+          viewedPage = decodeURI(viewedPage);
+
+          if (!viewedPage.startsWith(SolidAppContext.noAuth)) {
+            var ary = viewedPage.split(/\//);
+            SolidAppContext.idp = ary[0] + '//' + ary[2];
+            SolidAppContext.viewingNoAuthPage = false;
+          }
         }
+      }
     }
-    return SolidAppContext;
+  }
+
+  return SolidAppContext;
 }
 /**
  * Checks synchronously whether user is logged in
  *
  * @returns Named Node or null
  */
+
+
 function currentUser() {
-    var app = appContext();
-    if (app.viewingNoAuthPage) {
-        return (0, rdflib_1.sym)(app.webId);
-    }
-    if (exports.authSession.info.webId && exports.authSession.info.isLoggedIn) {
-        return (0, rdflib_1.sym)(exports.authSession.info.webId);
-    }
-    return offlineTestID(); // null unless testing
-    // JSON.parse(localStorage['solid-auth-client']).session.webId
+  var app = appContext();
+
+  if (app.viewingNoAuthPage) {
+    return (0, _rdflib.sym)(app.webId);
+  }
+
+  if (authSession.info.webId && authSession.info.isLoggedIn) {
+    return (0, _rdflib.sym)(authSession.info.webId);
+  }
+
+  return offlineTestID(); // null unless testing
+  // JSON.parse(localStorage['solid-auth-client']).session.webId
 }
-exports.currentUser = currentUser;
 /**
  * Resolves with the logged in user's WebID
  *
  * @param context
  */
+
+
 function logIn(context) {
-    var app = appContext();
-    var me = app.viewingNoAuthPage ? (0, rdflib_1.sym)(app.webId) : defaultTestUser(); // me is a NamedNode or null
-    if (me) {
-        context.me = me;
-        return Promise.resolve(context);
-    }
-    return new Promise(function (resolve) {
-        checkUser().then(function (webId) {
-            // Already logged in?
-            if (webId) {
-                context.me = (0, rdflib_1.sym)(webId);
-                debug.log("logIn: Already logged in as ".concat(context.me));
-                return resolve(context);
-            }
-            if (!context.div || !context.dom) {
-                return resolve(context);
-            }
-            var box = loginStatusBox(context.dom, function (webIdUri) {
-                saveUser(webIdUri, context);
-                resolve(context); // always pass growing context
-            });
-            context.div.appendChild(box);
-        });
+  var app = appContext();
+  var me = app.viewingNoAuthPage ? (0, _rdflib.sym)(app.webId) : defaultTestUser(); // me is a NamedNode or null
+
+  if (me) {
+    context.me = me;
+    return Promise.resolve(context);
+  }
+
+  return new Promise(function (resolve) {
+    checkUser().then(function (webId) {
+      // Already logged in?
+      if (webId) {
+        context.me = (0, _rdflib.sym)(webId);
+        debug.log("logIn: Already logged in as ".concat(context.me));
+        return resolve(context);
+      }
+
+      if (!context.div || !context.dom) {
+        return resolve(context);
+      }
+
+      var box = loginStatusBox(context.dom, function (webIdUri) {
+        saveUser(webIdUri, context);
+        resolve(context); // always pass growing context
+      });
+      context.div.appendChild(box);
     });
+  });
 }
-exports.logIn = logIn;
 /**
  * Logs the user in and loads their WebID profile document into the store
  *
@@ -254,42 +257,11 @@ exports.logIn = logIn;
  *
  * @returns Resolves with the context after login / fetch
  */
-function logInLoadProfile(context) {
-    return __awaiter(this, void 0, void 0, function () {
-        var loggedInContext, _a, err_1;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    // console.log('Solid UI logInLoadProfile')
-                    if (context.publicProfile) {
-                        return [2 /*return*/, context];
-                    } // already done
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, 4, , 5]);
-                    return [4 /*yield*/, logIn(context)];
-                case 2:
-                    loggedInContext = _b.sent();
-                    if (!loggedInContext.me) {
-                        throw new Error('Could not log in');
-                    }
-                    _a = context;
-                    return [4 /*yield*/, logic_1.solidLogicSingleton.loadProfile(loggedInContext.me)];
-                case 3:
-                    _a.publicProfile = _b.sent();
-                    return [3 /*break*/, 5];
-                case 4:
-                    err_1 = _b.sent();
-                    if (context.div && context.dom) {
-                        context.div.appendChild(widgets.errorMessageBlock(context.dom, err_1.message));
-                    }
-                    throw new Error("Can't log in: ".concat(err_1));
-                case 5: return [2 /*return*/, context];
-            }
-        });
-    });
+
+
+function logInLoadProfile(_x2) {
+  return _logInLoadProfile.apply(this, arguments);
 }
-exports.logInLoadProfile = logInLoadProfile;
 /**
  * Loads preference file
  * Do this after having done log in and load profile
@@ -298,144 +270,321 @@ exports.logInLoadProfile = logInLoadProfile;
  *
  * @param context
  */
-function logInLoadPreferences(context) {
-    return __awaiter(this, void 0, void 0, function () {
-        function complain(message) {
-            message = "logInLoadPreferences: ".concat(message);
-            if (statusArea) {
-                // statusArea.innerHTML = ''
-                statusArea.appendChild(widgets.errorMessageBlock(context.dom, message));
+
+
+function _logInLoadProfile() {
+  _logInLoadProfile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(context) {
+    var loggedInContext;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) {
+        switch (_context4.prev = _context4.next) {
+          case 0:
+            if (!context.publicProfile) {
+              _context4.next = 2;
+              break;
             }
-            debug.log(message);
-            // reject(new Error(message))
-        }
-        var statusArea, progressDisplay, preferencesFile, err_2, m2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    // console.log('Solid UI logInLoadPreferences')
-                    if (context.preferencesFile)
-                        return [2 /*return*/, Promise.resolve(context)]; // already done
-                    statusArea = context.statusArea || context.div || null;
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 4, , 5]);
-                    return [4 /*yield*/, logInLoadProfile(context)
-                        // console.log('back in Solid UI after logInLoadProfile', context)
-                    ];
-                case 2:
-                    context = _a.sent();
-                    return [4 /*yield*/, logic_1.solidLogicSingleton.loadPreferences(context.me)];
-                case 3:
-                    preferencesFile = _a.sent();
-                    if (progressDisplay) {
-                        progressDisplay.parentNode.removeChild(progressDisplay);
-                    }
-                    context.preferencesFile = preferencesFile;
-                    return [3 /*break*/, 5];
-                case 4:
-                    err_2 = _a.sent();
-                    m2 = void 0;
-                    if (err_2 instanceof solid_logic_1.UnauthorizedError) {
-                        m2 = 'Ooops - you are not authenticated (properly logged in) to for me to read your preference file.  Try loggin out and logging in?';
-                        (0, log_1.alert)(m2);
-                    }
-                    else if (err_2 instanceof solid_logic_1.CrossOriginForbiddenError) {
-                        m2 = "Unauthorized: Assuming preference file blocked for origin ".concat(window.location.origin);
-                        context.preferencesFileError = m2;
-                        return [2 /*return*/, context];
-                    }
-                    else if (err_2 instanceof solid_logic_1.SameOriginForbiddenError) {
-                        m2 = 'You are not authorized to read your preference file. This may be because you are using an untrusted web app.';
-                        debug.warn(m2);
-                    }
-                    else if (err_2 instanceof solid_logic_1.NotFoundError) {
-                        if (confirm("You do not currently have a preference file. OK for me to create an empty one? ".concat(err_2.preferencesFile || ''))) {
-                            // @@@ code me  ... weird to have a name of the file but no file
-                            (0, log_1.alert)("Sorry; I am not prepared to do this. Please create an empty file at ".concat(err_2.preferencesFile || '(?)'));
-                            complain(new Error('Sorry; no code yet to create a preference file at '));
-                        }
-                        else {
-                            throw (new Error("User declined to create a preference file at ".concat(err_2.preferencesFile || '(?)')));
-                        }
-                    }
-                    else if (err_2 instanceof solid_logic_1.FetchError) {
-                        m2 = "Strange: Error ".concat(err_2.status, " trying to read your preference file.").concat(err_2.message);
-                        (0, log_1.alert)(m2);
-                    }
-                    else {
-                        throw new Error("(via loadPrefs) ".concat(err_2));
-                    }
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/, context];
+
+            return _context4.abrupt("return", context);
+
+          case 2:
+            _context4.prev = 2;
+            _context4.next = 5;
+            return logIn(context);
+
+          case 5:
+            loggedInContext = _context4.sent;
+
+            if (loggedInContext.me) {
+              _context4.next = 8;
+              break;
             }
-        });
-    });
+
+            throw new Error('Could not log in');
+
+          case 8:
+            _context4.next = 10;
+            return _logic.solidLogicSingleton.loadProfile(loggedInContext.me);
+
+          case 10:
+            context.publicProfile = _context4.sent;
+            _context4.next = 17;
+            break;
+
+          case 13:
+            _context4.prev = 13;
+            _context4.t0 = _context4["catch"](2);
+
+            if (context.div && context.dom) {
+              context.div.appendChild(widgets.errorMessageBlock(context.dom, _context4.t0.message));
+            }
+
+            throw new Error("Can't log in: ".concat(_context4.t0));
+
+          case 17:
+            return _context4.abrupt("return", context);
+
+          case 18:
+          case "end":
+            return _context4.stop();
+        }
+      }
+    }, _callee4, null, [[2, 13]]);
+  }));
+  return _logInLoadProfile.apply(this, arguments);
+}
+
+function logInLoadPreferences(_x3) {
+  return _logInLoadPreferences.apply(this, arguments);
 }
-exports.logInLoadPreferences = logInLoadPreferences;
 /**
  * Resolves with the same context, outputting
  * output: index.public, index.private
  *
  * @see https://github.com/solid/solid/blob/main/proposals/data-discovery.md#discoverability
  */
-function loadIndex(context, isPublic) {
-    return __awaiter(this, void 0, void 0, function () {
-        var indexes;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, logic_1.solidLogicSingleton.loadIndexes(context.me, (isPublic ? context.publicProfile || null : null), (isPublic ? null : context.preferencesFile || null), function (err) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                        return [2 /*return*/, widgets.complain(context, err.message)];
-                    }); }); })];
-                case 1:
-                    indexes = _a.sent();
-                    context.index = context.index || {};
-                    context.index.private = indexes.private || context.index.private;
-                    context.index.public = indexes.public || context.index.public;
-                    return [2 /*return*/, context];
+
+
+function _logInLoadPreferences() {
+  _logInLoadPreferences = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(context) {
+    var statusArea, progressDisplay, complain, preferencesFile, m2;
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) {
+        switch (_context5.prev = _context5.next) {
+          case 0:
+            complain = function _complain(message) {
+              message = "logInLoadPreferences: ".concat(message);
+
+              if (statusArea) {
+                // statusArea.innerHTML = ''
+                statusArea.appendChild(widgets.errorMessageBlock(context.dom, message));
+              }
+
+              debug.log(message); // reject(new Error(message))
+            };
+
+            if (!context.preferencesFile) {
+              _context5.next = 3;
+              break;
             }
-        });
-    });
-}
-function loadTypeIndexes(context) {
-    return __awaiter(this, void 0, void 0, function () {
-        var indexes;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, logic_1.solidLogicSingleton.loadIndexes(context.me, context.publicProfile || null, context.preferencesFile || null, function (err) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                        return [2 /*return*/, widgets.complain(context, err.message)];
-                    }); }); })];
-                case 1:
-                    indexes = _a.sent();
-                    context.index = context.index || {};
-                    context.index.private = indexes.private || context.index.private;
-                    context.index.public = indexes.public || context.index.public;
-                    return [2 /*return*/, context];
+
+            return _context5.abrupt("return", Promise.resolve(context));
+
+          case 3:
+            // already done
+            statusArea = context.statusArea || context.div || null;
+            _context5.prev = 4;
+            _context5.next = 7;
+            return logInLoadProfile(context);
+
+          case 7:
+            context = _context5.sent;
+            _context5.next = 10;
+            return _logic.solidLogicSingleton.loadPreferences(context.me);
+
+          case 10:
+            preferencesFile = _context5.sent;
+
+            if (progressDisplay) {
+              progressDisplay.parentNode.removeChild(progressDisplay);
             }
-        });
-    });
+
+            context.preferencesFile = preferencesFile;
+            _context5.next = 48;
+            break;
+
+          case 15:
+            _context5.prev = 15;
+            _context5.t0 = _context5["catch"](4);
+
+            if (!(_context5.t0 instanceof _solidLogic.UnauthorizedError)) {
+              _context5.next = 22;
+              break;
+            }
+
+            m2 = 'Ooops - you are not authenticated (properly logged in) to for me to read your preference file.  Try loggin out and logging in?';
+            (0, _log.alert)(m2);
+            _context5.next = 48;
+            break;
+
+          case 22:
+            if (!(_context5.t0 instanceof _solidLogic.CrossOriginForbiddenError)) {
+              _context5.next = 28;
+              break;
+            }
+
+            m2 = "Unauthorized: Assuming preference file blocked for origin ".concat(window.location.origin);
+            context.preferencesFileError = m2;
+            return _context5.abrupt("return", context);
+
+          case 28:
+            if (!(_context5.t0 instanceof _solidLogic.SameOriginForbiddenError)) {
+              _context5.next = 33;
+              break;
+            }
+
+            m2 = 'You are not authorized to read your preference file. This may be because you are using an untrusted web app.';
+            debug.warn(m2);
+            _context5.next = 48;
+            break;
+
+          case 33:
+            if (!(_context5.t0 instanceof _solidLogic.NotFoundError)) {
+              _context5.next = 42;
+              break;
+            }
+
+            if (!confirm("You do not currently have a preference file. OK for me to create an empty one? ".concat(_context5.t0.preferencesFile || ''))) {
+              _context5.next = 39;
+              break;
+            }
+
+            // @@@ code me  ... weird to have a name of the file but no file
+            (0, _log.alert)("Sorry; I am not prepared to do this. Please create an empty file at ".concat(_context5.t0.preferencesFile || '(?)'));
+            complain(new Error('Sorry; no code yet to create a preference file at '));
+            _context5.next = 40;
+            break;
+
+          case 39:
+            throw new Error("User declined to create a preference file at ".concat(_context5.t0.preferencesFile || '(?)'));
+
+          case 40:
+            _context5.next = 48;
+            break;
+
+          case 42:
+            if (!(_context5.t0 instanceof _solidLogic.FetchError)) {
+              _context5.next = 47;
+              break;
+            }
+
+            m2 = "Strange: Error ".concat(_context5.t0.status, " trying to read your preference file.").concat(_context5.t0.message);
+            (0, _log.alert)(m2);
+            _context5.next = 48;
+            break;
+
+          case 47:
+            throw new Error("(via loadPrefs) ".concat(_context5.t0));
+
+          case 48:
+            return _context5.abrupt("return", context);
+
+          case 49:
+          case "end":
+            return _context5.stop();
+        }
+      }
+    }, _callee5, null, [[4, 15]]);
+  }));
+  return _logInLoadPreferences.apply(this, arguments);
+}
+
+function loadIndex(_x4, _x5) {
+  return _loadIndex.apply(this, arguments);
+}
+
+function _loadIndex() {
+  _loadIndex = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(context, isPublic) {
+    var indexes;
+    return _regenerator["default"].wrap(function _callee7$(_context7) {
+      while (1) {
+        switch (_context7.prev = _context7.next) {
+          case 0:
+            _context7.next = 2;
+            return _logic.solidLogicSingleton.loadIndexes(context.me, isPublic ? context.publicProfile || null : null, isPublic ? null : context.preferencesFile || null, /*#__PURE__*/function () {
+              var _ref4 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(err) {
+                return _regenerator["default"].wrap(function _callee6$(_context6) {
+                  while (1) {
+                    switch (_context6.prev = _context6.next) {
+                      case 0:
+                        return _context6.abrupt("return", widgets.complain(context, err.message));
+
+                      case 1:
+                      case "end":
+                        return _context6.stop();
+                    }
+                  }
+                }, _callee6);
+              }));
+
+              return function (_x21) {
+                return _ref4.apply(this, arguments);
+              };
+            }());
+
+          case 2:
+            indexes = _context7.sent;
+            context.index = context.index || {};
+            context.index["private"] = indexes["private"] || context.index["private"];
+            context.index["public"] = indexes["public"] || context.index["public"];
+            return _context7.abrupt("return", context);
+
+          case 7:
+          case "end":
+            return _context7.stop();
+        }
+      }
+    }, _callee7);
+  }));
+  return _loadIndex.apply(this, arguments);
+}
+
+function loadTypeIndexes(_x6) {
+  return _loadTypeIndexes.apply(this, arguments);
 }
-exports.loadTypeIndexes = loadTypeIndexes;
 /**
  * Resolves with the same context, outputting
  * @see https://github.com/solid/solid/blob/main/proposals/data-discovery.md#discoverability
  */
-function ensureTypeIndexes(context) {
-    return __awaiter(this, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, ensureOneTypeIndex(context, true)];
-                case 1:
-                    _a.sent();
-                    return [4 /*yield*/, ensureOneTypeIndex(context, false)];
-                case 2:
-                    _a.sent();
-                    return [2 /*return*/, context];
-            }
-        });
-    });
+
+
+function _loadTypeIndexes() {
+  _loadTypeIndexes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(context) {
+    var indexes;
+    return _regenerator["default"].wrap(function _callee9$(_context9) {
+      while (1) {
+        switch (_context9.prev = _context9.next) {
+          case 0:
+            _context9.next = 2;
+            return _logic.solidLogicSingleton.loadIndexes(context.me, context.publicProfile || null, context.preferencesFile || null, /*#__PURE__*/function () {
+              var _ref5 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(err) {
+                return _regenerator["default"].wrap(function _callee8$(_context8) {
+                  while (1) {
+                    switch (_context8.prev = _context8.next) {
+                      case 0:
+                        return _context8.abrupt("return", widgets.complain(context, err.message));
+
+                      case 1:
+                      case "end":
+                        return _context8.stop();
+                    }
+                  }
+                }, _callee8);
+              }));
+
+              return function (_x22) {
+                return _ref5.apply(this, arguments);
+              };
+            }());
+
+          case 2:
+            indexes = _context9.sent;
+            context.index = context.index || {};
+            context.index["private"] = indexes["private"] || context.index["private"];
+            context.index["public"] = indexes["public"] || context.index["public"];
+            return _context9.abrupt("return", context);
+
+          case 7:
+          case "end":
+            return _context9.stop();
+        }
+      }
+    }, _callee9);
+  }));
+  return _loadTypeIndexes.apply(this, arguments);
+}
+
+function ensureTypeIndexes(_x7) {
+  return _ensureTypeIndexes.apply(this, arguments);
 }
 /**
  * Load or create ONE type index
@@ -445,112 +594,36 @@ function ensureTypeIndexes(context) {
  * Adds its output to the context
  * @see https://github.com/solid/solid/blob/main/proposals/data-discovery.md#discoverability
  */
-function ensureOneTypeIndex(context, isPublic) {
-    return __awaiter(this, void 0, void 0, function () {
-        function makeIndexIfNecessary(context, isPublic) {
-            return __awaiter(this, void 0, void 0, function () {
-                function putIndex(newIndex) {
-                    return __awaiter(this, void 0, void 0, function () {
-                        var e_1, msg;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    _a.trys.push([0, 2, , 3]);
-                                    return [4 /*yield*/, logic_1.solidLogicSingleton.createEmptyRdfDoc(newIndex, 'Blank initial Type index')];
-                                case 1:
-                                    _a.sent();
-                                    return [2 /*return*/, context];
-                                case 2:
-                                    e_1 = _a.sent();
-                                    msg = "Error creating new index ".concat(e_1);
-                                    widgets.complain(context, msg);
-                                    return [3 /*break*/, 3];
-                                case 3: return [2 /*return*/];
-                            }
-                        });
-                    });
-                } // putIndex
-                var relevant, visibility, newIndex, addMe, err_3, msg, ixs, err_4;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            relevant = isPublic ? context.publicProfile : context.preferencesFile;
-                            visibility = isPublic ? 'public' : 'private';
-                            context.index = context.index || {};
-                            context.index[visibility] = context.index[visibility] || [];
-                            if (!(context.index[visibility].length === 0)) return [3 /*break*/, 6];
-                            newIndex = (0, rdflib_1.sym)("".concat(relevant.dir().uri + visibility, "TypeIndex.ttl"));
-                            debug.log("Linking to new fresh type index ".concat(newIndex));
-                            if (!confirm("OK to create a new empty index file at ".concat(newIndex, ", overwriting anything that is now there?"))) {
-                                throw new Error('cancelled by user');
-                            }
-                            debug.log("Linking to new fresh type index ".concat(newIndex));
-                            addMe = [
-                                (0, rdflib_1.st)(context.me, ns.solid("".concat(visibility, "TypeIndex")), newIndex, relevant)
-                            ];
-                            _a.label = 1;
-                        case 1:
-                            _a.trys.push([1, 3, , 4]);
-                            return [4 /*yield*/, logic_1.solidLogicSingleton.updatePromise([], addMe)];
-                        case 2:
-                            _a.sent();
-                            return [3 /*break*/, 4];
-                        case 3:
-                            err_3 = _a.sent();
-                            msg = "Error saving type index link saving back ".concat(newIndex, ": ").concat(err_3);
-                            widgets.complain(context, msg);
-                            return [2 /*return*/, context];
-                        case 4:
-                            debug.log("Creating new fresh type index file".concat(newIndex));
-                            return [4 /*yield*/, putIndex(newIndex)];
-                        case 5:
-                            _a.sent();
-                            context.index[visibility].push(newIndex); // @@ wait
-                            return [3 /*break*/, 10];
-                        case 6:
-                            ixs = context.index[visibility];
-                            _a.label = 7;
-                        case 7:
-                            _a.trys.push([7, 9, , 10]);
-                            return [4 /*yield*/, logic_1.solidLogicSingleton.load(ixs)];
-                        case 8:
-                            _a.sent();
-                            return [3 /*break*/, 10];
-                        case 9:
-                            err_4 = _a.sent();
-                            widgets.complain(context, "ensureOneTypeIndex: loading indexes ".concat(err_4));
-                            return [3 /*break*/, 10];
-                        case 10: return [2 /*return*/];
-                    }
-                });
-            });
-        } // makeIndexIfNecessary
-        var error_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 4]);
-                    return [4 /*yield*/, loadIndex(context, isPublic)];
-                case 1:
-                    _a.sent();
-                    if (context.index) {
-                        debug.log("ensureOneTypeIndex: Type index exists already ".concat(isPublic
-                            ? context.index.public[0]
-                            : context.index.private[0]));
-                    }
-                    return [2 /*return*/, context];
-                case 2:
-                    error_1 = _a.sent();
-                    return [4 /*yield*/, makeIndexIfNecessary(context, isPublic)
-                        // widgets.complain(context, 'calling loadIndex:' + error)
-                    ];
-                case 3:
-                    _a.sent();
-                    return [3 /*break*/, 4];
-                case 4: return [2 /*return*/];
-            }
-        });
-    });
+
+
+function _ensureTypeIndexes() {
+  _ensureTypeIndexes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(context) {
+    return _regenerator["default"].wrap(function _callee10$(_context10) {
+      while (1) {
+        switch (_context10.prev = _context10.next) {
+          case 0:
+            _context10.next = 2;
+            return ensureOneTypeIndex(context, true);
+
+          case 2:
+            _context10.next = 4;
+            return ensureOneTypeIndex(context, false);
+
+          case 4:
+            return _context10.abrupt("return", context);
+
+          case 5:
+          case "end":
+            return _context10.stop();
+        }
+      }
+    }, _callee10);
+  }));
+  return _ensureTypeIndexes.apply(this, arguments);
+}
+
+function ensureOneTypeIndex(_x8, _x9) {
+  return _ensureOneTypeIndex.apply(this, arguments);
 }
 /**
  * Returns promise of context with arrays of symbols
@@ -558,283 +631,519 @@ function ensureOneTypeIndex(context, isPublic) {
  * 2016-12-11 change to include forClass arc a la
  * https://github.com/solid/solid/blob/main/proposals/data-discovery.md
  */
-function findAppInstances(context, theClass, isPublic) {
-    return __awaiter(this, void 0, void 0, function () {
-        function unique(arr) {
-            return Array.from(new Set(arr));
-        }
-        var err_5, visibility, err_6, index, thisIndex, registrations, instances, containers, err_7, e, i, cont, _a, _b, _c;
-        return __generator(this, function (_d) {
-            switch (_d.label) {
-                case 0:
-                    if (!(isPublic === undefined)) return [3 /*break*/, 3];
-                    // Then both public and private
-                    // console.log('finding public app instance')
-                    return [4 /*yield*/, findAppInstances(context, theClass, true)
-                        // console.log('finding private app instance')
-                    ];
-                case 1:
-                    // Then both public and private
-                    // console.log('finding public app instance')
-                    _d.sent();
-                    // console.log('finding private app instance')
-                    return [4 /*yield*/, findAppInstances(context, theClass, false)
-                        // console.log('found public & private app instance', context)
-                    ];
-                case 2:
-                    // console.log('finding private app instance')
-                    _d.sent();
-                    // console.log('found public & private app instance', context)
-                    return [2 /*return*/, context];
-                case 3:
-                    _d.trys.push([3, 5, , 6]);
-                    // console.log('calling logInLoad', isPublic)
-                    return [4 /*yield*/, (isPublic
-                            ? logInLoadProfile(context)
-                            : logInLoadPreferences(context))
-                        // console.log('called logInLoad', isPublic)
-                    ];
-                case 4:
-                    // console.log('calling logInLoad', isPublic)
-                    _d.sent();
-                    return [3 /*break*/, 6];
-                case 5:
-                    err_5 = _d.sent();
-                    widgets.complain(context, "loadIndex: login and load problem ".concat(err_5));
-                    return [3 /*break*/, 6];
-                case 6:
-                    visibility = isPublic ? 'public' : 'private';
-                    _d.label = 7;
-                case 7:
-                    _d.trys.push([7, 9, , 10]);
-                    return [4 /*yield*/, loadIndex(context, isPublic)];
-                case 8:
-                    _d.sent();
-                    return [3 /*break*/, 10];
-                case 9:
-                    err_6 = _d.sent();
-                    return [3 /*break*/, 10];
-                case 10:
-                    index = context.index;
-                    thisIndex = index[visibility];
-                    registrations = thisIndex
-                        .map(function (ix) { return logic_1.solidLogicSingleton.store.each(undefined, ns.solid('forClass'), theClass, ix); })
-                        .reduce(function (acc, curr) { return acc.concat(curr); }, []);
-                    instances = registrations
-                        .map(function (reg) { return logic_1.solidLogicSingleton.store.each(reg, ns.solid('instance')); })
-                        .reduce(function (acc, curr) { return acc.concat(curr); }, []);
-                    containers = registrations
-                        .map(function (reg) { return logic_1.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) {
-                        return [2 /*return*/, context];
+
+
+function _ensureOneTypeIndex() {
+  _ensureOneTypeIndex = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(context, isPublic) {
+    var makeIndexIfNecessary, _makeIndexIfNecessary;
+
+    return _regenerator["default"].wrap(function _callee13$(_context13) {
+      while (1) {
+        switch (_context13.prev = _context13.next) {
+          case 0:
+            _makeIndexIfNecessary = function _makeIndexIfNecessary3() {
+              _makeIndexIfNecessary = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(context, isPublic) {
+                var relevant, visibility, putIndex, _putIndex, newIndex, addMe, msg, ixs;
+
+                return _regenerator["default"].wrap(function _callee12$(_context12) {
+                  while (1) {
+                    switch (_context12.prev = _context12.next) {
+                      case 0:
+                        _putIndex = function _putIndex3() {
+                          _putIndex = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee11(newIndex) {
+                            var _msg;
+
+                            return _regenerator["default"].wrap(function _callee11$(_context11) {
+                              while (1) {
+                                switch (_context11.prev = _context11.next) {
+                                  case 0:
+                                    _context11.prev = 0;
+                                    _context11.next = 3;
+                                    return _logic.solidLogicSingleton.createEmptyRdfDoc(newIndex, 'Blank initial Type index');
+
+                                  case 3:
+                                    return _context11.abrupt("return", context);
+
+                                  case 6:
+                                    _context11.prev = 6;
+                                    _context11.t0 = _context11["catch"](0);
+                                    _msg = "Error creating new index ".concat(_context11.t0);
+                                    widgets.complain(context, _msg);
+
+                                  case 10:
+                                  case "end":
+                                    return _context11.stop();
+                                }
+                              }
+                            }, _callee11, null, [[0, 6]]);
+                          }));
+                          return _putIndex.apply(this, arguments);
+                        };
+
+                        putIndex = function _putIndex2(_x25) {
+                          return _putIndex.apply(this, arguments);
+                        };
+
+                        relevant = isPublic ? context.publicProfile : context.preferencesFile;
+                        visibility = isPublic ? 'public' : 'private';
+                        // putIndex
+                        context.index = context.index || {};
+                        context.index[visibility] = context.index[visibility] || [];
+
+                        if (!(context.index[visibility].length === 0)) {
+                          _context12.next = 29;
+                          break;
+                        }
+
+                        newIndex = (0, _rdflib.sym)("".concat(relevant.dir().uri + visibility, "TypeIndex.ttl"));
+                        debug.log("Linking to new fresh type index ".concat(newIndex));
+
+                        if (confirm("OK to create a new empty index file at ".concat(newIndex, ", overwriting anything that is now there?"))) {
+                          _context12.next = 11;
+                          break;
+                        }
+
+                        throw new Error('cancelled by user');
+
+                      case 11:
+                        debug.log("Linking to new fresh type index ".concat(newIndex));
+                        addMe = [(0, _rdflib.st)(context.me, ns.solid("".concat(visibility, "TypeIndex")), newIndex, relevant)];
+                        _context12.prev = 13;
+                        _context12.next = 16;
+                        return _logic.solidLogicSingleton.updatePromise([], addMe);
+
+                      case 16:
+                        _context12.next = 23;
+                        break;
+
+                      case 18:
+                        _context12.prev = 18;
+                        _context12.t0 = _context12["catch"](13);
+                        msg = "Error saving type index link saving back ".concat(newIndex, ": ").concat(_context12.t0);
+                        widgets.complain(context, msg);
+                        return _context12.abrupt("return", context);
+
+                      case 23:
+                        debug.log("Creating new fresh type index file".concat(newIndex));
+                        _context12.next = 26;
+                        return putIndex(newIndex);
+
+                      case 26:
+                        context.index[visibility].push(newIndex); // @@ wait
+
+                        _context12.next = 38;
+                        break;
+
+                      case 29:
+                        // officially exists
+                        ixs = context.index[visibility];
+                        _context12.prev = 30;
+                        _context12.next = 33;
+                        return _logic.solidLogicSingleton.load(ixs);
+
+                      case 33:
+                        _context12.next = 38;
+                        break;
+
+                      case 35:
+                        _context12.prev = 35;
+                        _context12.t1 = _context12["catch"](30);
+                        widgets.complain(context, "ensureOneTypeIndex: loading indexes ".concat(_context12.t1));
+
+                      case 38:
+                      case "end":
+                        return _context12.stop();
                     }
-                    _d.label = 11;
-                case 11:
-                    _d.trys.push([11, 13, , 14]);
-                    return [4 /*yield*/, logic_1.solidLogicSingleton.load(containers)];
-                case 12:
-                    _d.sent();
-                    return [3 /*break*/, 14];
-                case 13:
-                    err_7 = _d.sent();
-                    e = new Error("[FAI] Unable to load containers".concat(err_7));
-                    debug.log(e); // complain
-                    widgets.complain(context, "Error looking for ".concat(utils.label(theClass), ":  ").concat(err_7));
-                    return [3 /*break*/, 14];
-                case 14:
-                    i = 0;
-                    _d.label = 15;
-                case 15:
-                    if (!(i < containers.length)) return [3 /*break*/, 18];
-                    cont = containers[i];
-                    _a = context;
-                    _c = (_b = context.instances).concat;
-                    return [4 /*yield*/, logic_1.solidLogicSingleton.getContainerMembers(cont.value)];
-                case 16:
-                    _a.instances = _c.apply(_b, [(_d.sent()).map(function (uri) { return logic_1.solidLogicSingleton.store.sym(uri); }) // @@ warning: uses strings not NN
-                    ]);
-                    _d.label = 17;
-                case 17:
-                    i++;
-                    return [3 /*break*/, 15];
-                case 18: return [2 /*return*/, context];
+                  }
+                }, _callee12, null, [[13, 18], [30, 35]]);
+              }));
+              return _makeIndexIfNecessary.apply(this, arguments);
+            };
+
+            makeIndexIfNecessary = function _makeIndexIfNecessary2(_x23, _x24) {
+              return _makeIndexIfNecessary.apply(this, arguments);
+            };
+
+            _context13.prev = 2;
+            _context13.next = 5;
+            return loadIndex(context, isPublic);
+
+          case 5:
+            if (context.index) {
+              debug.log("ensureOneTypeIndex: Type index exists already ".concat(isPublic ? context.index["public"][0] : context.index["private"][0]));
             }
-        });
-    });
+
+            return _context13.abrupt("return", context);
+
+          case 9:
+            _context13.prev = 9;
+            _context13.t0 = _context13["catch"](2);
+            _context13.next = 13;
+            return makeIndexIfNecessary(context, isPublic);
+
+          case 13:
+          case "end":
+            return _context13.stop();
+        }
+      }
+    }, _callee13, null, [[2, 9]]);
+  }));
+  return _ensureOneTypeIndex.apply(this, arguments);
+}
+
+function findAppInstances(_x10, _x11, _x12) {
+  return _findAppInstances.apply(this, arguments);
 }
-exports.findAppInstances = findAppInstances;
 /**
  * Register a new app in a type index
  */
-function registerInTypeIndex(context, instance, theClass, isPublic) {
-    return __awaiter(this, void 0, void 0, function () {
-        var indexes, index, registration, ins, e_2;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, ensureOneTypeIndex(context, isPublic)];
-                case 1:
-                    _a.sent();
-                    if (!context.index) {
-                        throw new Error('registerInTypeIndex: No type index found');
-                    }
-                    indexes = isPublic ? context.index.public : context.index.private;
-                    if (!indexes.length) {
-                        throw new Error('registerInTypeIndex: What no type index?');
-                    }
-                    index = indexes[0];
-                    registration = widgets.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 = 2;
-                case 2:
-                    _a.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, logic_1.solidLogicSingleton.updatePromise([], ins)];
-                case 3:
-                    _a.sent();
-                    return [3 /*break*/, 5];
-                case 4:
-                    e_2 = _a.sent();
-                    debug.log(e_2);
-                    (0, log_1.alert)(e_2);
-                    return [3 /*break*/, 5];
-                case 5: return [2 /*return*/, context];
+
+
+function _findAppInstances() {
+  _findAppInstances = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14(context, theClass, isPublic) {
+    var visibility, index, thisIndex, registrations, instances, containers, unique, e, i, cont;
+    return _regenerator["default"].wrap(function _callee14$(_context14) {
+      while (1) {
+        switch (_context14.prev = _context14.next) {
+          case 0:
+            unique = function _unique(arr) {
+              return Array.from(new Set(arr));
+            };
+
+            if (!(isPublic === undefined)) {
+              _context14.next = 7;
+              break;
             }
-        });
-    });
+
+            _context14.next = 4;
+            return findAppInstances(context, theClass, true);
+
+          case 4:
+            _context14.next = 6;
+            return findAppInstances(context, theClass, false);
+
+          case 6:
+            return _context14.abrupt("return", context);
+
+          case 7:
+            _context14.prev = 7;
+            _context14.next = 10;
+            return isPublic ? logInLoadProfile(context) : logInLoadPreferences(context);
+
+          case 10:
+            _context14.next = 15;
+            break;
+
+          case 12:
+            _context14.prev = 12;
+            _context14.t0 = _context14["catch"](7);
+            widgets.complain(context, "loadIndex: login and load problem ".concat(_context14.t0));
+
+          case 15:
+            // console.log('awaited LogInLoad!', context)
+            visibility = isPublic ? 'public' : 'private';
+            _context14.prev = 16;
+            _context14.next = 19;
+            return loadIndex(context, isPublic);
+
+          case 19:
+            _context14.next = 23;
+            break;
+
+          case 21:
+            _context14.prev = 21;
+            _context14.t1 = _context14["catch"](16);
+
+          case 23:
+            index = context.index;
+            thisIndex = index[visibility];
+            registrations = thisIndex.map(function (ix) {
+              return _logic.solidLogicSingleton.store.each(undefined, ns.solid('forClass'), theClass, ix);
+            }).reduce(function (acc, curr) {
+              return acc.concat(curr);
+            }, []);
+            instances = registrations.map(function (reg) {
+              return _logic.solidLogicSingleton.store.each(reg, ns.solid('instance'));
+            }).reduce(function (acc, curr) {
+              return acc.concat(curr);
+            }, []);
+            containers = registrations.map(function (reg) {
+              return _logic.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) {
+              _context14.next = 34;
+              break;
+            }
+
+            return _context14.abrupt("return", context);
+
+          case 34:
+            _context14.prev = 34;
+            _context14.next = 37;
+            return _logic.solidLogicSingleton.load(containers);
+
+          case 37:
+            _context14.next = 44;
+            break;
+
+          case 39:
+            _context14.prev = 39;
+            _context14.t2 = _context14["catch"](34);
+            e = new Error("[FAI] Unable to load containers".concat(_context14.t2));
+            debug.log(e); // complain
+
+            widgets.complain(context, "Error looking for ".concat(utils.label(theClass), ":  ").concat(_context14.t2)); // but then ignore it
+            // throw new Error(e)
+
+          case 44:
+            i = 0;
+
+          case 45:
+            if (!(i < containers.length)) {
+              _context14.next = 55;
+              break;
+            }
+
+            cont = containers[i];
+            _context14.t3 = context.instances;
+            _context14.next = 50;
+            return _logic.solidLogicSingleton.getContainerMembers(cont.value);
+
+          case 50:
+            _context14.t4 = _context14.sent.map(function (uri) {
+              return _logic.solidLogicSingleton.store.sym(uri);
+            });
+            context.instances = _context14.t3.concat.call(_context14.t3, _context14.t4);
+
+          case 52:
+            i++;
+            _context14.next = 45;
+            break;
+
+          case 55:
+            return _context14.abrupt("return", context);
+
+          case 56:
+          case "end":
+            return _context14.stop();
+        }
+      }
+    }, _callee14, null, [[7, 12], [16, 21], [34, 39]]);
+  }));
+  return _findAppInstances.apply(this, arguments);
+}
+
+function registerInTypeIndex(_x13, _x14, _x15, _x16) {
+  return _registerInTypeIndex.apply(this, arguments);
 }
-exports.registerInTypeIndex = registerInTypeIndex;
 /**
  * UI to control registration of instance
  */
+
+
+function _registerInTypeIndex() {
+  _registerInTypeIndex = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(context, instance, theClass, isPublic) {
+    var indexes, index, registration, ins;
+    return _regenerator["default"].wrap(function _callee15$(_context15) {
+      while (1) {
+        switch (_context15.prev = _context15.next) {
+          case 0:
+            _context15.next = 2;
+            return ensureOneTypeIndex(context, isPublic);
+
+          case 2:
+            if (context.index) {
+              _context15.next = 4;
+              break;
+            }
+
+            throw new Error('registerInTypeIndex: No type index found');
+
+          case 4:
+            indexes = isPublic ? context.index["public"] : context.index["private"];
+
+            if (indexes.length) {
+              _context15.next = 7;
+              break;
+            }
+
+            throw new Error('registerInTypeIndex: What no type index?');
+
+          case 7:
+            index = indexes[0];
+            registration = widgets.newThing(index);
+            ins = [// See https://github.com/solid/solid/blob/main/proposals/data-discovery.md
+            (0, _rdflib.st)(registration, ns.rdf('type'), ns.solid('TypeRegistration'), index), (0, _rdflib.st)(registration, ns.solid('forClass'), theClass, index), (0, _rdflib.st)(registration, ns.solid('instance'), instance, index)];
+            _context15.prev = 10;
+            _context15.next = 13;
+            return _logic.solidLogicSingleton.updatePromise([], ins);
+
+          case 13:
+            _context15.next = 19;
+            break;
+
+          case 15:
+            _context15.prev = 15;
+            _context15.t0 = _context15["catch"](10);
+            debug.log(_context15.t0);
+            (0, _log.alert)(_context15.t0);
+
+          case 19:
+            return _context15.abrupt("return", context);
+
+          case 20:
+          case "end":
+            return _context15.stop();
+        }
+      }
+    }, _callee15, null, [[10, 15]]);
+  }));
+  return _registerInTypeIndex.apply(this, arguments);
+}
+
 function registrationControl(context, instance, theClass) {
-    var dom = context.dom;
-    if (!dom || !context.div) {
-        return Promise.resolve();
+  var dom = context.dom;
+
+  if (!dom || !context.div) {
+    return Promise.resolve();
+  }
+
+  var box = dom.createElement('div');
+  context.div.appendChild(box);
+  return ensureTypeIndexes(context).then(function () {
+    box.innerHTML = '<table><tbody><tr></tr><tr></tr></tbody></table>'; // tbody will be inserted anyway
+
+    box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid gray 0.05em;');
+    var tbody = box.children[0].children[0];
+    var form = new _rdflib.BlankNode(); // @@ say for now
+
+    var registrationStatements = function registrationStatements(index) {
+      var registrations = _logic.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)];
+    };
+
+    var index, statements;
+
+    if (context.index && context.index["public"] && context.index["public"].length > 0) {
+      index = context.index["public"][0];
+      statements = registrationStatements(index);
+      tbody.children[0].appendChild(widgets.buildCheckBoxForm(context.dom, _logic.solidLogicSingleton.store, "Public link to this ".concat(context.noun), null, statements, form, index));
     }
-    var box = dom.createElement('div');
-    context.div.appendChild(box);
-    return ensureTypeIndexes(context)
-        .then(function () {
-        box.innerHTML = '<table><tbody><tr></tr><tr></tr></tbody></table>'; // tbody will be inserted anyway
-        box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid gray 0.05em;');
-        var tbody = box.children[0].children[0];
-        var form = new rdflib_1.BlankNode(); // @@ say for now
-        var registrationStatements = function (index) {
-            var registrations = logic_1.solidLogicSingleton.getRegistrations(instance, theClass);
-            var reg = registrations.length
-                ? registrations[0]
-                : widgets.newThing(index);
-            return [
-                (0, rdflib_1.st)(reg, ns.solid('instance'), instance, index),
-                (0, rdflib_1.st)(reg, ns.solid('forClass'), theClass, index)
-            ];
-        };
-        var index, statements;
-        if (context.index && context.index.public && context.index.public.length > 0) {
-            index = context.index.public[0];
-            statements = registrationStatements(index);
-            tbody.children[0].appendChild(widgets.buildCheckBoxForm(context.dom, logic_1.solidLogicSingleton.store, "Public link to this ".concat(context.noun), null, statements, form, index));
-        }
-        if (context.index && context.index.private && context.index.private.length > 0) {
-            index = context.index.private[0];
-            statements = registrationStatements(index);
-            tbody.children[1].appendChild(widgets.buildCheckBoxForm(context.dom, logic_1.solidLogicSingleton.store, "Personal note of this ".concat(context.noun), null, statements, form, index));
-        }
-        return context;
-    }, function (e) {
-        var msg;
-        if (context.div && context.preferencesFileError) {
-            msg = '(Preferences not available)';
-            context.div.appendChild(dom.createElement('p')).textContent = msg;
-        }
-        else if (context.div) {
-            msg = "registrationControl: Type indexes not available: ".concat(e);
-            context.div.appendChild(widgets.errorMessageBlock(context.dom, e));
-        }
-        debug.log(msg);
-    })
-        .catch(function (e) {
-        var msg = "registrationControl: Error making panel: ".concat(e);
-        if (context.div) {
-            context.div.appendChild(widgets.errorMessageBlock(context.dom, e));
-        }
-        debug.log(msg);
-    });
+
+    if (context.index && context.index["private"] && context.index["private"].length > 0) {
+      index = context.index["private"][0];
+      statements = registrationStatements(index);
+      tbody.children[1].appendChild(widgets.buildCheckBoxForm(context.dom, _logic.solidLogicSingleton.store, "Personal note of this ".concat(context.noun), null, statements, form, index));
+    }
+
+    return context;
+  }, function (e) {
+    var msg;
+
+    if (context.div && context.preferencesFileError) {
+      msg = '(Preferences not available)';
+      context.div.appendChild(dom.createElement('p')).textContent = msg;
+    } else if (context.div) {
+      msg = "registrationControl: Type indexes not available: ".concat(e);
+      context.div.appendChild(widgets.errorMessageBlock(context.dom, e));
+    }
+
+    debug.log(msg);
+  })["catch"](function (e) {
+    var msg = "registrationControl: Error making panel: ".concat(e);
+
+    if (context.div) {
+      context.div.appendChild(widgets.errorMessageBlock(context.dom, e));
+    }
+
+    debug.log(msg);
+  });
 }
-exports.registrationControl = registrationControl;
 /**
  * UI to List at all registered things
  */
+
+
 function registrationList(context, options) {
-    var dom = context.dom;
-    var div = context.div;
-    var box = dom.createElement('div');
-    div.appendChild(box);
-    return ensureTypeIndexes(context).then(function (_indexes) {
-        box.innerHTML = '<table><tbody></tbody></table>'; // 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 && options[visibility]) {
-                ix = ix.concat(context.index[visibility][0]);
-                sts = sts.concat(logic_1.solidLogicSingleton.store.statementsMatching(undefined, ns.solid('instance'), undefined, context.index[visibility][0]));
-            }
-        });
-        var _loop_1 = function (i) {
-            var statement = sts[i];
-            if (options.type) { // now check  terms:forClass
-                if (!logic_1.solidLogicSingleton.store.holds(statement.subject, ns.solid('forClass'), options.type, statement.why)) {
-                    return "continue";
-                }
-            }
-            // const cla = statement.subject
-            var inst = statement.object;
-            table.appendChild(widgets.personTR(dom, ns.solid('instance'), inst, {
-                deleteFunction: function (_x) {
-                    if (!logic_1.solidLogicSingleton.store.updater) {
-                        throw new Error('Cannot delete this, store has no updater');
-                    }
-                    logic_1.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));
-                        }
-                    });
-                }
-            }));
-        };
-        for (var i = 0; i < sts.length; i++) {
-            _loop_1(i);
-        } // registrationList
-        /*
-           //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;
+  var dom = context.dom;
+  var div = context.div;
+  var box = dom.createElement('div');
+  div.appendChild(box);
+  return ensureTypeIndexes(context).then(function (_indexes) {
+    box.innerHTML = '<table><tbody></tbody></table>'; // 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 && options[visibility]) {
+        ix = ix.concat(context.index[visibility][0]);
+        sts = sts.concat(_logic.solidLogicSingleton.store.statementsMatching(undefined, ns.solid('instance'), undefined, context.index[visibility][0]));
+      }
     });
+
+    var _loop = function _loop(i) {
+      var statement = sts[i];
+
+      if (options.type) {
+        // now check  terms:forClass
+        if (!_logic.solidLogicSingleton.store.holds(statement.subject, ns.solid('forClass'), options.type, statement.why)) {
+          return "continue"; // skip irrelevant ones
+        }
+      } // const cla = statement.subject
+
+
+      var inst = statement.object;
+      table.appendChild(widgets.personTR(dom, ns.solid('instance'), inst, {
+        deleteFunction: function deleteFunction(_x) {
+          if (!_logic.solidLogicSingleton.store.updater) {
+            throw new Error('Cannot delete this, store has no updater');
+          }
+
+          _logic.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));
+            }
+          });
+        }
+      }));
+    };
+
+    for (var i = 0; i < sts.length; i++) {
+      var _ret = _loop(i);
+
+      if (_ret === "continue") continue;
+    } // registrationList
+
+    /*
+       //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;
+  });
 }
-exports.registrationList = registrationList;
 /**
  * Simple Access Control
  *
@@ -848,55 +1157,64 @@ exports.registrationList = registrationList;
  *
  * @returns Resolves with aclDoc uri on successful write
  */
+
+
 function setACLUserPublic(docURI, me, options) {
-    var aclDoc = logic_1.solidLogicSingleton.store.any(logic_1.solidLogicSingleton.store.sym(docURI), solid_logic_1.ACL_LINK);
-    return Promise.resolve()
-        .then(function () {
-        if (aclDoc) {
-            return aclDoc;
-        }
-        return fetchACLRel(docURI).catch(function (err) {
-            throw new Error("Error fetching rel=ACL header for ".concat(docURI, ": ").concat(err));
-        });
-    })
-        .then(function (aclDoc) {
-        var aclText = genACLText(docURI, me, aclDoc.uri, options);
-        if (!logic_1.solidLogicSingleton.store.fetcher) {
-            throw new Error('Cannot PUT this, store has no fetcher');
-        }
-        return logic_1.solidLogicSingleton.store.fetcher
-            .webOperation('PUT', aclDoc.uri, {
-            data: aclText,
-            contentType: 'text/turtle'
-        })
-            .then(function (result) {
-            if (!result.ok) {
-                throw new Error('Error writing ACL text: ' + result.error);
-            }
-            return aclDoc;
-        });
+  var aclDoc = _logic.solidLogicSingleton.store.any(_logic.solidLogicSingleton.store.sym(docURI), _solidLogic.ACL_LINK);
+
+  return Promise.resolve().then(function () {
+    if (aclDoc) {
+      return aclDoc;
+    }
+
+    return fetchACLRel(docURI)["catch"](function (err) {
+      throw new Error("Error fetching rel=ACL header for ".concat(docURI, ": ").concat(err));
     });
+  }).then(function (aclDoc) {
+    var aclText = genACLText(docURI, me, aclDoc.uri, options);
+
+    if (!_logic.solidLogicSingleton.store.fetcher) {
+      throw new Error('Cannot PUT this, store has no fetcher');
+    }
+
+    return _logic.solidLogicSingleton.store.fetcher.webOperation('PUT', aclDoc.uri, {
+      data: aclText,
+      contentType: 'text/turtle'
+    }).then(function (result) {
+      if (!result.ok) {
+        throw new Error('Error writing ACL text: ' + result.error);
+      }
+
+      return aclDoc;
+    });
+  });
 }
-exports.setACLUserPublic = setACLUserPublic;
 /**
  * @param docURI
  * @returns
  */
+
+
 function fetchACLRel(docURI) {
-    var fetcher = logic_1.solidLogicSingleton.store.fetcher;
-    if (!fetcher) {
-        throw new Error('Cannot fetch ACL rel, store has no fetcher');
+  var fetcher = _logic.solidLogicSingleton.store.fetcher;
+
+  if (!fetcher) {
+    throw new Error('Cannot fetch ACL rel, store has no fetcher');
+  }
+
+  return fetcher.load(docURI).then(function (result) {
+    if (!result.ok) {
+      throw new Error('fetchACLRel: While loading:' + result.error);
     }
-    return fetcher.load(docURI).then(function (result) {
-        if (!result.ok) {
-            throw new Error('fetchACLRel: While loading:' + result.error);
-        }
-        var aclDoc = logic_1.solidLogicSingleton.store.any(logic_1.solidLogicSingleton.store.sym(docURI), solid_logic_1.ACL_LINK);
-        if (!aclDoc) {
-            throw new Error('fetchACLRel: No Link rel=ACL header for ' + docURI);
-        }
-        return aclDoc;
-    });
+
+    var aclDoc = _logic.solidLogicSingleton.store.any(_logic.solidLogicSingleton.store.sym(docURI), _solidLogic.ACL_LINK);
+
+    if (!aclDoc) {
+      throw new Error('fetchACLRel: No Link rel=ACL header for ' + docURI);
+    }
+
+    return aclDoc;
+  });
 }
 /**
  * @param docURI
@@ -906,66 +1224,75 @@ function fetchACLRel(docURI) {
  *
  * @returns Serialized ACL
  */
-function genACLText(docURI, me, aclURI, options) {
-    if (options === void 0) { options = {}; }
-    var optPublic = options.public || [];
-    var g = (0, rdflib_1.graph)();
-    var auth = (0, rdflib_1.Namespace)('http://www.w3.org/ns/auth/acl#');
-    var a = g.sym("".concat(aclURI, "#a1"));
-    var acl = g.sym(aclURI);
-    var doc = g.sym(docURI);
+
+
+function genACLText(docURI, me, aclURI) {
+  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var optPublic = options["public"] || [];
+  var g = (0, _rdflib.graph)();
+  var auth = (0, _rdflib.Namespace)('http://www.w3.org/ns/auth/acl#');
+  var a = g.sym("".concat(aclURI, "#a1"));
+  var acl = g.sym(aclURI);
+  var doc = g.sym(docURI);
+  g.add(a, ns.rdf('type'), auth('Authorization'), acl);
+  g.add(a, auth('accessTo'), doc, acl);
+
+  if (options.defaultForNew) {
+    g.add(a, auth('default'), doc, acl);
+  }
+
+  g.add(a, auth('agent'), me, acl);
+  g.add(a, auth('mode'), auth('Read'), acl);
+  g.add(a, auth('mode'), auth('Write'), acl);
+  g.add(a, auth('mode'), auth('Control'), acl);
+
+  if (optPublic.length) {
+    a = g.sym("".concat(aclURI, "#a2"));
     g.add(a, ns.rdf('type'), auth('Authorization'), acl);
     g.add(a, auth('accessTo'), doc, acl);
-    if (options.defaultForNew) {
-        g.add(a, auth('default'), doc, acl);
-    }
-    g.add(a, auth('agent'), me, acl);
-    g.add(a, auth('mode'), auth('Read'), acl);
-    g.add(a, auth('mode'), auth('Write'), acl);
-    g.add(a, auth('mode'), auth('Control'), acl);
-    if (optPublic.length) {
-        a = g.sym("".concat(aclURI, "#a2"));
-        g.add(a, ns.rdf('type'), auth('Authorization'), acl);
-        g.add(a, auth('accessTo'), doc, acl);
-        g.add(a, auth('agentClass'), ns.foaf('Agent'), acl);
-        for (var p = 0; p < optPublic.length; p++) {
-            g.add(a, auth('mode'), auth(optPublic[p]), acl); // Like 'Read' etc
-        }
+    g.add(a, auth('agentClass'), ns.foaf('Agent'), acl);
+
+    for (var p = 0; p < optPublic.length; p++) {
+      g.add(a, auth('mode'), auth(optPublic[p]), acl); // Like 'Read' etc
     }
-    return (0, rdflib_1.serialize)(acl, g, aclURI);
+  }
+
+  return (0, _rdflib.serialize)(acl, g, aclURI);
 }
 /**
  * Returns `sym($SolidTestEnvironment.username)` if
  * `$SolidTestEnvironment.username` is defined as a global
  * @returns {NamedNode|null}
  */
+
+
 function offlineTestID() {
-    var $SolidTestEnvironment = window.$SolidTestEnvironment;
-    if (typeof $SolidTestEnvironment !== 'undefined' &&
-        $SolidTestEnvironment.username) {
-        // Test setup
-        debug.log('Assuming the user is ' + $SolidTestEnvironment.username);
-        return (0, rdflib_1.sym)($SolidTestEnvironment.username);
-    }
-    if (typeof document !== 'undefined' &&
-        document.location &&
-        ('' + document.location).slice(0, 16) === 'http://localhost') {
-        var div = document.getElementById('appTarget');
-        if (!div)
-            return null;
-        var id = div.getAttribute('testID');
-        if (!id)
-            return null;
-        /* me = solidLogicSingleton.store.any(subject, ns.acl('owner')); // when testing on plane with no WebID
-         */
-        debug.log('Assuming user is ' + id);
-        return (0, rdflib_1.sym)(id);
-    }
-    return null;
+  var _window2 = window,
+      $SolidTestEnvironment = _window2.$SolidTestEnvironment;
+
+  if (typeof $SolidTestEnvironment !== 'undefined' && $SolidTestEnvironment.username) {
+    // Test setup
+    debug.log('Assuming the user is ' + $SolidTestEnvironment.username);
+    return (0, _rdflib.sym)($SolidTestEnvironment.username);
+  }
+
+  if (typeof document !== 'undefined' && document.location && ('' + document.location).slice(0, 16) === 'http://localhost') {
+    var div = document.getElementById('appTarget');
+    if (!div) return null;
+    var id = div.getAttribute('testID');
+    if (!id) return null;
+    /* me = solidLogicSingleton.store.any(subject, ns.acl('owner')); // when testing on plane with no WebID
+     */
+
+    debug.log('Assuming user is ' + id);
+    return (0, _rdflib.sym)(id);
+  }
+
+  return null;
 }
-exports.offlineTestID = offlineTestID;
+
 function getDefaultSignInButtonStyle() {
-    return 'padding: 1em; border-radius:0.5em; font-size: 100%;';
+  return 'padding: 1em; border-radius:0.5em; font-size: 100%;';
 }
 /**
  * Bootstrapping identity
@@ -976,210 +1303,252 @@ function getDefaultSignInButtonStyle() {
  *
  * @returns
  */
-function signInOrSignUpBox(dom, setUserCallback, options) {
-    if (options === void 0) { options = {}; }
-    options = options || {};
-    var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle();
-    // @@ TODO Remove the need to cast HTML element to any
-    var box = dom.createElement('div');
-    var magicClassName = 'SolidSignInOrSignUpBox';
-    debug.log('widgets.signInOrSignUpBox');
-    box.setUserCallback = setUserCallback;
-    box.setAttribute('class', magicClassName);
-    box.style = 'display:flex;'; // @@ fix all typecasts like this
-    // Sign in button with PopUP
-    var signInPopUpButton = dom.createElement('input'); // multi
-    box.appendChild(signInPopUpButton);
-    signInPopUpButton.setAttribute('type', 'button');
-    signInPopUpButton.setAttribute('value', 'Log in');
-    signInPopUpButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eef;"));
-    exports.authSession.onLogin(function () {
-        var sessionInfo = exports.authSession.info;
-        if (sessionInfo && sessionInfo.isLoggedIn) {
-            var webIdURI = sessionInfo.webId;
-            // setUserCallback(webIdURI)
-            var divs = dom.getElementsByClassName(magicClassName);
-            debug.log("Logged in, ".concat(divs.length, " panels to be serviced"));
-            // At the same time, satisfy all the other login boxes
-            for (var i = 0; i < divs.length; i++) {
-                var div = divs[i];
-                // @@ TODO Remove the need to manipulate HTML elements
-                if (div.setUserCallback) {
-                    try {
-                        div.setUserCallback(webIdURI);
-                        var parent_1 = div.parentNode;
-                        if (parent_1) {
-                            parent_1.removeChild(div);
-                        }
-                    }
-                    catch (e) {
-                        debug.log("## Error satisfying login box: ".concat(e));
-                        div.appendChild(widgets.errorMessageBlock(dom, e));
-                    }
-                }
+
+
+function signInOrSignUpBox(dom, setUserCallback) {
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  options = options || {};
+  var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle(); // @@ TODO Remove the need to cast HTML element to any
+
+  var box = dom.createElement('div');
+  var magicClassName = 'SolidSignInOrSignUpBox';
+  debug.log('widgets.signInOrSignUpBox');
+  box.setUserCallback = setUserCallback;
+  box.setAttribute('class', magicClassName);
+  box.style = 'display:flex;'; // @@ fix all typecasts like this
+  // Sign in button with PopUP
+
+  var signInPopUpButton = dom.createElement('input'); // multi
+
+  box.appendChild(signInPopUpButton);
+  signInPopUpButton.setAttribute('type', 'button');
+  signInPopUpButton.setAttribute('value', 'Log in');
+  signInPopUpButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eef;"));
+  authSession.onLogin(function () {
+    var sessionInfo = authSession.info;
+
+    if (sessionInfo && sessionInfo.isLoggedIn) {
+      var webIdURI = sessionInfo.webId; // setUserCallback(webIdURI)
+
+      var divs = dom.getElementsByClassName(magicClassName);
+      debug.log("Logged in, ".concat(divs.length, " panels to be serviced")); // At the same time, satisfy all the other login boxes
+
+      for (var i = 0; i < divs.length; i++) {
+        var div = divs[i]; // @@ TODO Remove the need to manipulate HTML elements
+
+        if (div.setUserCallback) {
+          try {
+            div.setUserCallback(webIdURI);
+            var parent = div.parentNode;
+
+            if (parent) {
+              parent.removeChild(div);
             }
+          } catch (e) {
+            debug.log("## Error satisfying login box: ".concat(e));
+            div.appendChild(widgets.errorMessageBlock(dom, e));
+          }
         }
+      }
+    }
+  });
+  signInPopUpButton.addEventListener('click', function () {
+    var offline = offlineTestID();
+    if (offline) return setUserCallback(offline.uri);
+    renderSignInPopup(dom);
+  }, false); // Sign up button
+
+  var signupButton = dom.createElement('input');
+  box.appendChild(signupButton);
+  signupButton.setAttribute('type', 'button');
+  signupButton.setAttribute('value', 'Sign Up for Solid');
+  signupButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #efe;"));
+  signupButton.addEventListener('click', function (_event) {
+    var signupMgr = new _signup.Signup();
+    signupMgr.signup().then(function (uri) {
+      debug.log('signInOrSignUpBox signed up ' + uri);
+      setUserCallback(uri);
     });
-    signInPopUpButton.addEventListener('click', function () {
-        var offline = offlineTestID();
-        if (offline)
-            return setUserCallback(offline.uri);
-        renderSignInPopup(dom);
-    }, false);
-    // Sign up button
-    var signupButton = dom.createElement('input');
-    box.appendChild(signupButton);
-    signupButton.setAttribute('type', 'button');
-    signupButton.setAttribute('value', 'Sign Up for Solid');
-    signupButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #efe;"));
-    signupButton.addEventListener('click', function (_event) {
-        var signupMgr = new signup_1.Signup();
-        signupMgr.signup().then(function (uri) {
-            debug.log('signInOrSignUpBox signed up ' + uri);
-            setUserCallback(uri);
-        });
-    }, false);
-    return box;
+  }, false);
+  return box;
 }
+
 function renderSignInPopup(dom) {
-    var _this = this;
-    /**
-     * Issuer Menu
-     */
-    var issuerPopup = dom.createElement('div');
-    issuerPopup.setAttribute('style', 'position: fixed; top: 0; left: 0; right: 0; bottom: 0; display: flex; justify-content: center; align-items: center;');
-    dom.body.appendChild(issuerPopup);
-    var issuerPopupBox = dom.createElement('div');
-    issuerPopupBox.setAttribute('style', "\n     background-color: white;\n     box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.2);\n     -webkit-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.2);\n     -moz-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.2);\n     -o-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.2);\n     border-radius: 4px;\n     min-width: 400px;\n     padding: 10px;\n   ");
-    issuerPopup.appendChild(issuerPopupBox);
-    var issuerPopupBoxTopMenu = dom.createElement('div');
-    issuerPopupBoxTopMenu.setAttribute('style', "\n     border-bottom: 1px solid #DDD;\n     display: flex;\n     flex-direction: row;\n     align-items: center;\n     justify-content: space-between;\n   ");
-    issuerPopupBox.appendChild(issuerPopupBoxTopMenu);
-    var issuerPopupBoxLabel = dom.createElement('label');
-    issuerPopupBoxLabel.setAttribute('style', 'margin-right: 5px; font-weight: 800');
-    issuerPopupBoxLabel.innerText = 'Select an identity provider';
-    var issuerPopupBoxCloseButton = dom.createElement('button');
-    issuerPopupBoxCloseButton.innerHTML = '<img src="https://solid.github.io/solid-ui/src/icons/noun_1180156.svg" style="width: 2em; height: 2em;" title="Cancel">';
-    issuerPopupBoxCloseButton.setAttribute('style', 'background-color: transparent; border: none;');
-    issuerPopupBoxCloseButton.addEventListener('click', function () {
-        issuerPopup.remove();
-    });
-    issuerPopupBoxTopMenu.appendChild(issuerPopupBoxLabel);
-    issuerPopupBoxTopMenu.appendChild(issuerPopupBoxCloseButton);
-    var loginToIssuer = function (issuerUri) { return __awaiter(_this, void 0, void 0, function () {
-        var preLoginRedirectHash, err_8;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    preLoginRedirectHash = new URL(window.location.href).hash;
-                    if (preLoginRedirectHash) {
-                        window.localStorage.setItem('preLoginRedirectHash', preLoginRedirectHash);
-                    }
-                    window.localStorage.setItem('loginIssuer', issuerUri);
-                    // Login
-                    return [4 /*yield*/, exports.authSession.login({
-                            redirectUrl: window.location.href,
-                            oidcIssuer: issuerUri
-                        })];
-                case 1:
-                    // Login
-                    _a.sent();
-                    return [3 /*break*/, 3];
-                case 2:
-                    err_8 = _a.sent();
-                    (0, log_1.alert)(err_8.message);
-                    return [3 /*break*/, 3];
-                case 3: return [2 /*return*/];
-            }
-        });
-    }); };
-    /**
-      * Text-based idp selection
-      */
-    var issuerTextContainer = dom.createElement('div');
-    issuerTextContainer.setAttribute('style', "\n     border-bottom: 1px solid #DDD;\n     display: flex;\n     flex-direction: column;\n     padding-top: 10px;\n   ");
-    var issuerTextInputContainer = dom.createElement('div');
-    issuerTextInputContainer.setAttribute('style', "\n     display: flex;\n     flex-direction: row;\n   ");
-    var issuerTextLabel = dom.createElement('label');
-    issuerTextLabel.innerText = 'Enter the URL of your identity provider:';
-    issuerTextLabel.setAttribute('style', 'color: #888');
-    var issuerTextInput = dom.createElement('input');
-    issuerTextInput.setAttribute('type', 'text');
-    issuerTextInput.setAttribute('style', 'margin-left: 0 !important; flex: 1; margin-right: 5px !important');
-    issuerTextInput.setAttribute('placeholder', 'https://example.com');
-    issuerTextInput.value = localStorage.getItem('loginIssuer') || '';
-    var issuerTextGoButton = dom.createElement('button');
-    issuerTextGoButton.innerText = 'Go';
-    issuerTextGoButton.setAttribute('style', 'margin-top: 12px; margin-bottom: 12px;');
-    issuerTextGoButton.addEventListener('click', function () {
-        loginToIssuer(issuerTextInput.value);
-    });
-    issuerTextContainer.appendChild(issuerTextLabel);
-    issuerTextInputContainer.appendChild(issuerTextInput);
-    issuerTextInputContainer.appendChild(issuerTextGoButton);
-    issuerTextContainer.appendChild(issuerTextInputContainer);
-    issuerPopupBox.appendChild(issuerTextContainer);
-    /**
-      * Button-based idp selection
-      */
-    var issuerButtonContainer = dom.createElement('div');
-    issuerButtonContainer.setAttribute('style', "\n      display: flex;\n      flex-direction: column;\n      padding-top: 10px;\n   ");
-    var issuerBottonLabel = dom.createElement('label');
-    issuerBottonLabel.innerText = 'Or pick an identity provider from the list below:';
-    issuerBottonLabel.setAttribute('style', 'color: #888');
-    issuerButtonContainer.appendChild(issuerBottonLabel);
-    getSuggestedIssuers().forEach(function (issuerInfo) {
-        var issuerButton = dom.createElement('button');
-        issuerButton.innerText = issuerInfo.name;
-        issuerButton.setAttribute('style', 'height: 38px; margin-top: 10px');
-        issuerButton.addEventListener('click', function () {
-            loginToIssuer(issuerInfo.uri);
-        });
-        issuerButtonContainer.appendChild(issuerButton);
+  /**
+   * Issuer Menu
+   */
+  var issuerPopup = dom.createElement('div');
+  issuerPopup.setAttribute('style', 'position: fixed; top: 0; left: 0; right: 0; bottom: 0; display: flex; justify-content: center; align-items: center;');
+  dom.body.appendChild(issuerPopup);
+  var issuerPopupBox = dom.createElement('div');
+  issuerPopupBox.setAttribute('style', "\n     background-color: white;\n     box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.2);\n     -webkit-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.2);\n     -moz-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.2);\n     -o-box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.2);\n     border-radius: 4px;\n     min-width: 400px;\n     padding: 10px;\n   ");
+  issuerPopup.appendChild(issuerPopupBox);
+  var issuerPopupBoxTopMenu = dom.createElement('div');
+  issuerPopupBoxTopMenu.setAttribute('style', "\n     border-bottom: 1px solid #DDD;\n     display: flex;\n     flex-direction: row;\n     align-items: center;\n     justify-content: space-between;\n   ");
+  issuerPopupBox.appendChild(issuerPopupBoxTopMenu);
+  var issuerPopupBoxLabel = dom.createElement('label');
+  issuerPopupBoxLabel.setAttribute('style', 'margin-right: 5px; font-weight: 800');
+  issuerPopupBoxLabel.innerText = 'Select an identity provider';
+  var issuerPopupBoxCloseButton = dom.createElement('button');
+  issuerPopupBoxCloseButton.innerHTML = '<img src="https://solid.github.io/solid-ui/src/icons/noun_1180156.svg" style="width: 2em; height: 2em;" title="Cancel">';
+  issuerPopupBoxCloseButton.setAttribute('style', 'background-color: transparent; border: none;');
+  issuerPopupBoxCloseButton.addEventListener('click', function () {
+    issuerPopup.remove();
+  });
+  issuerPopupBoxTopMenu.appendChild(issuerPopupBoxLabel);
+  issuerPopupBoxTopMenu.appendChild(issuerPopupBoxCloseButton);
+
+  var loginToIssuer = /*#__PURE__*/function () {
+    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(issuerUri) {
+      var preLoginRedirectHash;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              // Save hash
+              preLoginRedirectHash = new URL(window.location.href).hash;
+
+              if (preLoginRedirectHash) {
+                window.localStorage.setItem('preLoginRedirectHash', preLoginRedirectHash);
+              }
+
+              window.localStorage.setItem('loginIssuer', issuerUri); // Login
+
+              _context.next = 6;
+              return authSession.login({
+                redirectUrl: window.location.href,
+                oidcIssuer: issuerUri
+              });
+
+            case 6:
+              _context.next = 11;
+              break;
+
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](0);
+              (0, _log.alert)(_context.t0.message);
+
+            case 11:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee, null, [[0, 8]]);
+    }));
+
+    return function loginToIssuer(_x17) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  /**
+    * Text-based idp selection
+    */
+
+
+  var issuerTextContainer = dom.createElement('div');
+  issuerTextContainer.setAttribute('style', "\n     border-bottom: 1px solid #DDD;\n     display: flex;\n     flex-direction: column;\n     padding-top: 10px;\n   ");
+  var issuerTextInputContainer = dom.createElement('div');
+  issuerTextInputContainer.setAttribute('style', "\n     display: flex;\n     flex-direction: row;\n   ");
+  var issuerTextLabel = dom.createElement('label');
+  issuerTextLabel.innerText = 'Enter the URL of your identity provider:';
+  issuerTextLabel.setAttribute('style', 'color: #888');
+  var issuerTextInput = dom.createElement('input');
+  issuerTextInput.setAttribute('type', 'text');
+  issuerTextInput.setAttribute('style', 'margin-left: 0 !important; flex: 1; margin-right: 5px !important');
+  issuerTextInput.setAttribute('placeholder', 'https://example.com');
+  issuerTextInput.value = localStorage.getItem('loginIssuer') || '';
+  var issuerTextGoButton = dom.createElement('button');
+  issuerTextGoButton.innerText = 'Go';
+  issuerTextGoButton.setAttribute('style', 'margin-top: 12px; margin-bottom: 12px;');
+  issuerTextGoButton.addEventListener('click', function () {
+    loginToIssuer(issuerTextInput.value);
+  });
+  issuerTextContainer.appendChild(issuerTextLabel);
+  issuerTextInputContainer.appendChild(issuerTextInput);
+  issuerTextInputContainer.appendChild(issuerTextGoButton);
+  issuerTextContainer.appendChild(issuerTextInputContainer);
+  issuerPopupBox.appendChild(issuerTextContainer);
+  /**
+    * Button-based idp selection
+    */
+
+  var issuerButtonContainer = dom.createElement('div');
+  issuerButtonContainer.setAttribute('style', "\n      display: flex;\n      flex-direction: column;\n      padding-top: 10px;\n   ");
+  var issuerBottonLabel = dom.createElement('label');
+  issuerBottonLabel.innerText = 'Or pick an identity provider from the list below:';
+  issuerBottonLabel.setAttribute('style', 'color: #888');
+  issuerButtonContainer.appendChild(issuerBottonLabel);
+  getSuggestedIssuers().forEach(function (issuerInfo) {
+    var issuerButton = dom.createElement('button');
+    issuerButton.innerText = issuerInfo.name;
+    issuerButton.setAttribute('style', 'height: 38px; margin-top: 10px');
+    issuerButton.addEventListener('click', function () {
+      loginToIssuer(issuerInfo.uri);
     });
-    issuerPopupBox.appendChild(issuerButtonContainer);
+    issuerButtonContainer.appendChild(issuerButton);
+  });
+  issuerPopupBox.appendChild(issuerButtonContainer);
 }
-exports.renderSignInPopup = renderSignInPopup;
 /**
  * @returns - A list of suggested OIDC issuers
  */
+
+
 function getSuggestedIssuers() {
-    // Suggest a default list of OIDC issuers
-    var issuers = __spreadArray([], DEFAULT_ISSUERS, true);
-    // Suggest the current host if not already included
-    var _a = new URL(location.href), host = _a.host, origin = _a.origin;
-    var hosts = issuers.map(function (_a) {
-        var uri = _a.uri;
-        return new URL(uri).host;
+  // Suggest a default list of OIDC issuers
+  var issuers = [].concat(DEFAULT_ISSUERS); // Suggest the current host if not already included
+
+  var _URL = new URL(location.href),
+      host = _URL.host,
+      origin = _URL.origin;
+
+  var hosts = issuers.map(function (_ref2) {
+    var uri = _ref2.uri;
+    return new URL(uri).host;
+  });
+
+  if (!hosts.includes(host) && !hosts.some(function (existing) {
+    return isSubdomainOf(host, existing);
+  })) {
+    issuers.unshift({
+      name: host,
+      uri: origin
     });
-    if (!hosts.includes(host) && !hosts.some(function (existing) { return isSubdomainOf(host, existing); })) {
-        issuers.unshift({ name: host, uri: origin });
-    }
-    return issuers;
+  }
+
+  return issuers;
 }
+
 function isSubdomainOf(subdomain, domain) {
-    var dot = subdomain.length - domain.length - 1;
-    return dot > 0 && subdomain[dot] === '.' && subdomain.endsWith(domain);
+  var dot = subdomain.length - domain.length - 1;
+  return dot > 0 && subdomain[dot] === '.' && subdomain.endsWith(domain);
 }
 /**
  * @returns {Promise<string|null>} Resolves with WebID URI or null
  */
+
+
 function webIdFromSession(session) {
-    var webId = (session === null || session === void 0 ? void 0 : session.webId) && session.isLoggedIn ? session.webId : null;
-    if (webId) {
-        saveUser(webId);
-    }
-    return webId;
+  var webId = session !== null && session !== void 0 && session.webId && session.isLoggedIn ? session.webId : null;
+
+  if (webId) {
+    saveUser(webId);
+  }
+
+  return webId;
 }
 /**
  * @returns {Promise<string|null>} Resolves with WebID URI or null
  */
+
 /*
 function checkCurrentUser () {
   return checkUser()
 }
 */
+
 /**
  * Retrieves currently logged in webId from either
  * defaultTestUser or SolidAuth
@@ -1187,68 +1556,11 @@ function checkCurrentUser () {
  *
  * @returns Resolves with webId uri, if no callback provided
  */
-function checkUser(setUserCallback) {
-    return __awaiter(this, void 0, void 0, function () {
-        var preLoginRedirectHash, postLoginRedirectHash, curUrl, me, webId;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    preLoginRedirectHash = new URL(window.location.href).hash;
-                    if (preLoginRedirectHash) {
-                        window.localStorage.setItem('preLoginRedirectHash', preLoginRedirectHash);
-                    }
-                    exports.authSession.onSessionRestore(function (url) {
-                        if (document.location.toString() !== url)
-                            history.replaceState(null, '', url);
-                    });
-                    /**
-                     * Handle a successful authentication redirect
-                     */
-                    return [4 /*yield*/, exports.authSession
-                            .handleIncomingRedirect({
-                            restorePreviousSession: true,
-                            url: window.location.href
-                        })
-                        // Check to see if a hash was stored in local storage
-                    ];
-                case 1:
-                    /**
-                     * Handle a successful authentication redirect
-                     */
-                    _a.sent();
-                    postLoginRedirectHash = window.localStorage.getItem('preLoginRedirectHash');
-                    if (postLoginRedirectHash) {
-                        curUrl = new URL(window.location.href);
-                        if (curUrl.hash !== postLoginRedirectHash) {
-                            if (history.pushState) {
-                                // console.log('Setting window.location.has using pushState')
-                                history.pushState(null, document.title, postLoginRedirectHash);
-                            }
-                            else {
-                                // console.warn('Setting window.location.has using location.hash')
-                                location.hash = postLoginRedirectHash;
-                            }
-                            curUrl.hash = postLoginRedirectHash;
-                        }
-                        // See https://stackoverflow.com/questions/3870057/how-can-i-update-window-location-hash-without-jumping-the-document
-                        // indow.location.href = curUrl.toString()// @@ See https://developer.mozilla.org/en-US/docs/Web/API/Window/location
-                        window.localStorage.setItem('preLoginRedirectHash', '');
-                    }
-                    me = defaultTestUser();
-                    if (me) {
-                        return [2 /*return*/, Promise.resolve(setUserCallback ? setUserCallback(me) : me)];
-                    }
-                    webId = webIdFromSession(exports.authSession.info);
-                    me = saveUser(webId);
-                    if (me) {
-                        debug.log("(Logged in as ".concat(me, " by authentication)"));
-                    }
-                    return [2 /*return*/, Promise.resolve(setUserCallback ? setUserCallback(me) : me)];
-            }
-        });
-    });
+
+
+function checkUser(_x18) {
+  return _checkUser.apply(this, arguments);
 }
-exports.checkUser = checkUser;
 /**
  * Login status box
  *
@@ -1259,135 +1571,259 @@ exports.checkUser = checkUser;
  *
  * @returns
  */
-function loginStatusBox(dom, listener, options) {
-    if (listener === void 0) { listener = null; }
-    if (options === void 0) { options = {}; }
-    // 20190630
-    var me = defaultTestUser();
-    // @@ TODO Remove the need to cast HTML element to any
-    var box = dom.createElement('div');
-    function setIt(newidURI) {
-        if (!newidURI) {
-            return;
-        }
-        var uri = newidURI.uri || newidURI;
-        //    UI.preferences.set('me', uri)
-        me = (0, rdflib_1.sym)(uri);
-        box.refresh();
-        if (listener)
-            listener(me.uri);
-    }
-    function logoutButtonHandler(_event) {
-        // UI.preferences.set('me', '')
-        exports.authSession.logout().then(function () {
-            var message = "Your WebID was ".concat(me, ". It has been forgotten.");
-            me = null;
-            try {
-                (0, log_1.alert)(message);
-            }
-            catch (e) {
-                window.alert(message);
+
+
+function _checkUser() {
+  _checkUser = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee16(setUserCallback) {
+    var preLoginRedirectHash, postLoginRedirectHash, curUrl, me, webId;
+    return _regenerator["default"].wrap(function _callee16$(_context16) {
+      while (1) {
+        switch (_context16.prev = _context16.next) {
+          case 0:
+            // Save hash for "restorePreviousSession"
+            preLoginRedirectHash = new URL(window.location.href).hash;
+
+            if (preLoginRedirectHash) {
+              window.localStorage.setItem('preLoginRedirectHash', preLoginRedirectHash);
             }
-            box.refresh();
-            if (listener)
-                listener(null);
-        }, function (err) {
-            (0, log_1.alert)('Fail to log out:' + err);
-        });
-    }
-    function logoutButton(me, options) {
-        var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle();
-        var logoutLabel = 'WebID logout';
-        if (me) {
-            var nick = logic_1.solidLogicSingleton.store.any(me, ns.foaf('nick')) ||
-                logic_1.solidLogicSingleton.store.any(me, ns.foaf('name'));
-            if (nick) {
-                logoutLabel = 'Logout ' + nick.value;
+
+            authSession.onSessionRestore(function (url) {
+              if (document.location.toString() !== url) history.replaceState(null, '', url);
+            });
+            /**
+             * Handle a successful authentication redirect
+             */
+
+            _context16.next = 5;
+            return authSession.handleIncomingRedirect({
+              restorePreviousSession: true,
+              url: window.location.href
+            });
+
+          case 5:
+            // Check to see if a hash was stored in local storage
+            postLoginRedirectHash = window.localStorage.getItem('preLoginRedirectHash');
+
+            if (postLoginRedirectHash) {
+              curUrl = new URL(window.location.href);
+
+              if (curUrl.hash !== postLoginRedirectHash) {
+                if (history.pushState) {
+                  // console.log('Setting window.location.has using pushState')
+                  history.pushState(null, document.title, postLoginRedirectHash);
+                } else {
+                  // console.warn('Setting window.location.has using location.hash')
+                  location.hash = postLoginRedirectHash;
+                }
+
+                curUrl.hash = postLoginRedirectHash;
+              } // See https://stackoverflow.com/questions/3870057/how-can-i-update-window-location-hash-without-jumping-the-document
+              // indow.location.href = curUrl.toString()// @@ See https://developer.mozilla.org/en-US/docs/Web/API/Window/location
+
+
+              window.localStorage.setItem('preLoginRedirectHash', '');
+            } // Check to see if already logged in / have the WebID
+
+
+            me = defaultTestUser();
+
+            if (!me) {
+              _context16.next = 10;
+              break;
             }
-        }
-        var signOutButton = dom.createElement('input');
-        // signOutButton.className = 'WebIDCancelButton'
-        signOutButton.setAttribute('type', 'button');
-        signOutButton.setAttribute('value', logoutLabel);
-        signOutButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eee;"));
-        signOutButton.addEventListener('click', logoutButtonHandler, false);
-        return signOutButton;
-    }
-    box.refresh = function () {
-        var sessionInfo = exports.authSession.info;
-        if (sessionInfo && sessionInfo.webId && sessionInfo.isLoggedIn) {
-            me = (0, rdflib_1.sym)(sessionInfo.webId);
-        }
-        else {
-            me = null;
-        }
-        if ((me && box.me !== me.uri) || (!me && box.me)) {
-            widgets.clearElement(box);
+
+            return _context16.abrupt("return", Promise.resolve(setUserCallback ? setUserCallback(me) : me));
+
+          case 10:
+            // doc = solidLogicSingleton.store.any(doc, ns.link('userMirror')) || doc
+            webId = webIdFromSession(authSession.info);
+            me = saveUser(webId);
+
             if (me) {
-                box.appendChild(logoutButton(me, options));
-            }
-            else {
-                box.appendChild(signInOrSignUpBox(dom, setIt, options));
+              debug.log("(Logged in as ".concat(me, " by authentication)"));
             }
+
+            return _context16.abrupt("return", Promise.resolve(setUserCallback ? setUserCallback(me) : me));
+
+          case 14:
+          case "end":
+            return _context16.stop();
         }
-        box.me = me ? me.uri : null;
-    };
-    function trackSession() {
-        var sessionInfo = exports.authSession.info;
-        if (sessionInfo && sessionInfo.webId && sessionInfo.isLoggedIn) {
-            me = (0, rdflib_1.sym)(sessionInfo.webId);
-        }
-        else {
-            me = null;
-        }
-        box.refresh();
+      }
+    }, _callee16);
+  }));
+  return _checkUser.apply(this, arguments);
+}
+
+function loginStatusBox(dom) {
+  var listener = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  // 20190630
+  var me = defaultTestUser(); // @@ TODO Remove the need to cast HTML element to any
+
+  var box = dom.createElement('div');
+
+  function setIt(newidURI) {
+    if (!newidURI) {
+      return;
     }
-    trackSession();
-    exports.authSession.onLogin(trackSession);
-    exports.authSession.onLogout(trackSession);
-    box.me = '99999'; // Force refresh
+
+    var uri = newidURI.uri || newidURI; //    UI.preferences.set('me', uri)
+
+    me = (0, _rdflib.sym)(uri);
     box.refresh();
-    return box;
-}
-exports.loginStatusBox = loginStatusBox;
-exports.authSession.onLogout(function () { return __awaiter(void 0, void 0, void 0, function () {
-    var issuer, wellKnownUri, wellKnownResult, openidConfiguration, err_9;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0:
-                issuer = window.localStorage.getItem('loginIssuer');
-                if (!issuer) return [3 /*break*/, 7];
-                _a.label = 1;
-            case 1:
-                _a.trys.push([1, 6, , 7]);
-                wellKnownUri = new URL(issuer);
-                wellKnownUri.pathname = '/.well-known/openid-configuration';
-                return [4 /*yield*/, fetch(wellKnownUri.toString())];
-            case 2:
-                wellKnownResult = _a.sent();
-                if (!(wellKnownResult.status === 200)) return [3 /*break*/, 5];
-                return [4 /*yield*/, wellKnownResult.json()];
-            case 3:
-                openidConfiguration = _a.sent();
-                if (!(openidConfiguration && openidConfiguration.end_session_endpoint)) return [3 /*break*/, 5];
-                return [4 /*yield*/, fetch(openidConfiguration.end_session_endpoint, { credentials: 'include' })];
-            case 4:
-                _a.sent();
-                _a.label = 5;
-            case 5: return [3 /*break*/, 7];
-            case 6:
-                err_9 = _a.sent();
-                return [3 /*break*/, 7];
-            case 7:
-                window.location.reload();
-                return [2 /*return*/];
-        }
+    if (listener) listener(me.uri);
+  }
+
+  function logoutButtonHandler(_event) {
+    // UI.preferences.set('me', '')
+    authSession.logout().then(function () {
+      var message = "Your WebID was ".concat(me, ". It has been forgotten.");
+      me = null;
+
+      try {
+        (0, _log.alert)(message);
+      } catch (e) {
+        window.alert(message);
+      }
+
+      box.refresh();
+      if (listener) listener(null);
+    }, function (err) {
+      (0, _log.alert)('Fail to log out:' + err);
     });
-}); });
+  }
+
+  function logoutButton(me, options) {
+    var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle();
+    var logoutLabel = 'WebID logout';
+
+    if (me) {
+      var nick = _logic.solidLogicSingleton.store.any(me, ns.foaf('nick')) || _logic.solidLogicSingleton.store.any(me, ns.foaf('name'));
+
+      if (nick) {
+        logoutLabel = 'Logout ' + nick.value;
+      }
+    }
+
+    var signOutButton = dom.createElement('input'); // signOutButton.className = 'WebIDCancelButton'
+
+    signOutButton.setAttribute('type', 'button');
+    signOutButton.setAttribute('value', logoutLabel);
+    signOutButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eee;"));
+    signOutButton.addEventListener('click', logoutButtonHandler, false);
+    return signOutButton;
+  }
+
+  box.refresh = function () {
+    var sessionInfo = authSession.info;
+
+    if (sessionInfo && sessionInfo.webId && sessionInfo.isLoggedIn) {
+      me = (0, _rdflib.sym)(sessionInfo.webId);
+    } else {
+      me = null;
+    }
+
+    if (me && box.me !== me.uri || !me && box.me) {
+      widgets.clearElement(box);
+
+      if (me) {
+        box.appendChild(logoutButton(me, options));
+      } else {
+        box.appendChild(signInOrSignUpBox(dom, setIt, options));
+      }
+    }
+
+    box.me = me ? me.uri : null;
+  };
+
+  function trackSession() {
+    var sessionInfo = authSession.info;
+
+    if (sessionInfo && sessionInfo.webId && sessionInfo.isLoggedIn) {
+      me = (0, _rdflib.sym)(sessionInfo.webId);
+    } else {
+      me = null;
+    }
+
+    box.refresh();
+  }
+
+  trackSession();
+  authSession.onLogin(trackSession);
+  authSession.onLogout(trackSession);
+  box.me = '99999'; // Force refresh
+
+  box.refresh();
+  return box;
+}
+
+authSession.onLogout( /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+  var issuer, wellKnownUri, wellKnownResult, openidConfiguration;
+  return _regenerator["default"].wrap(function _callee2$(_context2) {
+    while (1) {
+      switch (_context2.prev = _context2.next) {
+        case 0:
+          issuer = window.localStorage.getItem('loginIssuer');
+
+          if (!issuer) {
+            _context2.next = 19;
+            break;
+          }
+
+          _context2.prev = 2;
+          wellKnownUri = new URL(issuer);
+          wellKnownUri.pathname = '/.well-known/openid-configuration';
+          _context2.next = 7;
+          return fetch(wellKnownUri.toString());
+
+        case 7:
+          wellKnownResult = _context2.sent;
+
+          if (!(wellKnownResult.status === 200)) {
+            _context2.next = 15;
+            break;
+          }
+
+          _context2.next = 11;
+          return wellKnownResult.json();
+
+        case 11:
+          openidConfiguration = _context2.sent;
+
+          if (!(openidConfiguration && openidConfiguration.end_session_endpoint)) {
+            _context2.next = 15;
+            break;
+          }
+
+          _context2.next = 15;
+          return fetch(openidConfiguration.end_session_endpoint, {
+            credentials: 'include'
+          });
+
+        case 15:
+          _context2.next = 19;
+          break;
+
+        case 17:
+          _context2.prev = 17;
+          _context2.t0 = _context2["catch"](2);
+
+        case 19:
+          window.location.reload();
+
+        case 20:
+        case "end":
+          return _context2.stop();
+      }
+    }
+  }, _callee2, null, [[2, 17]]);
+})));
 /**
  * Workspace selection etc
  * See https://github.com/solid/userguide/issues/16
  */
+
 /**
  * Returns a UI object which, if it selects a workspace,
  * will callback(workspace, newBase).
@@ -1406,209 +1842,266 @@ exports.authSession.onLogout(function () { return __awaiter(void 0, void 0, void
  * @param appDetails
  * @param callbackWS
  */
+
 function selectWorkspace(dom, appDetails, callbackWS) {
-    var noun = appDetails.noun;
-    var appPathSegment = appDetails.appPathSegment;
-    var me = defaultTestUser();
-    var box = dom.createElement('div');
-    var context = { me: me, dom: dom, div: box };
-    function say(s, background) {
-        box.appendChild(widgets.errorMessageBlock(dom, s, background));
+  var noun = appDetails.noun;
+  var appPathSegment = appDetails.appPathSegment;
+  var me = defaultTestUser();
+  var box = dom.createElement('div');
+  var context = {
+    me: me,
+    dom: dom,
+    div: box
+  };
+
+  function say(s, background) {
+    box.appendChild(widgets.errorMessageBlock(dom, s, background));
+  }
+
+  function figureOutBase(ws) {
+    var newBaseNode = _logic.solidLogicSingleton.store.any(ws, ns.space('uriPrefix'));
+
+    var newBaseString;
+
+    if (!newBaseNode) {
+      newBaseString = ws.uri.split('#')[0];
+    } else {
+      newBaseString = newBaseNode.value;
     }
-    function figureOutBase(ws) {
-        var newBaseNode = logic_1.solidLogicSingleton.store.any(ws, ns.space('uriPrefix'));
-        var newBaseString;
-        if (!newBaseNode) {
-            newBaseString = ws.uri.split('#')[0];
-        }
-        else {
-            newBaseString = newBaseNode.value;
-        }
-        if (newBaseString.slice(-1) !== '/') {
-            debug.log("".concat(appPathSegment, ": No / at end of uriPrefix ").concat(newBaseString)); // @@ paramater?
-            newBaseString = "".concat(newBaseString, "/");
-        }
-        var now = new Date();
-        newBaseString += "".concat(appPathSegment, "/id").concat(now.getTime(), "/"); // unique id
-        return newBaseString;
+
+    if (newBaseString.slice(-1) !== '/') {
+      debug.log("".concat(appPathSegment, ": No / at end of uriPrefix ").concat(newBaseString)); // @@ paramater?
+
+      newBaseString = "".concat(newBaseString, "/");
     }
-    function displayOptions(context) {
-        // console.log('displayOptions!', context)
-        function makeNewWorkspace(_event) {
-            return __awaiter(this, void 0, void 0, function () {
-                var row, cell, newBase, _a, newWs, newData;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0:
-                            row = table.appendChild(dom.createElement('tr'));
-                            cell = row.appendChild(dom.createElement('td'));
-                            cell.setAttribute('colspan', '3');
-                            cell.style.padding = '0.5em';
-                            _a = encodeURI;
-                            return [4 /*yield*/, widgets.askName(dom, logic_1.solidLogicSingleton.store, cell, ns.solid('URL'), ns.space('Workspace'), 'Workspace')];
-                        case 1:
-                            newBase = _a.apply(void 0, [_b.sent()]);
-                            newWs = widgets.newThing(context.preferencesFile);
-                            newData = [(0, rdflib_1.st)(context.me, ns.space('workspace'), newWs, context.preferencesFile),
-                                // eslint-disable-next-line camelcase
-                                (0, rdflib_1.st)(newWs, ns.space('uriPrefix'), newBase, context.preferencesFile)];
-                            if (!logic_1.solidLogicSingleton.store.updater) {
-                                throw new Error('store has no updater');
-                            }
-                            return [4 /*yield*/, logic_1.solidLogicSingleton.store.updater.update([], newData)
-                                // @@ now refresh list of workspaces
-                            ];
-                        case 2:
-                            _b.sent();
-                            return [2 /*return*/];
-                    }
-                });
-            });
-        }
-        // const status = ''
-        var id = context.me;
-        var preferencesFile = context.preferencesFile;
-        var newBase = null;
-        // A workspace specifically defined in the private preference file:
-        var w = logic_1.solidLogicSingleton.store.each(id, ns.space('workspace'), undefined, preferencesFile); // Only trust preference file here
-        // A workspace in a storage in the public profile:
-        var storages = logic_1.solidLogicSingleton.store.each(id, ns.space('storage')); // @@ No provenance requirement at the moment
-        if (w.length === 0 && storages) {
-            say("You don't seem to have any workspaces. You have ".concat(storages.length, " storage spaces."), 'white');
-            storages.map(function (s) {
-                w = w.concat(logic_1.solidLogicSingleton.store.each(s, ns.ldp('contains')));
-                return w;
-            }).filter(function (file) {
-                return (file.id) ? ['public', 'private'].includes(file.id().toLowerCase()) : '';
-            });
-        }
-        if (w.length === 1) {
-            say("Workspace used: ".concat(w[0].uri), 'white'); // @@ allow user to see URI
-            newBase = figureOutBase(w[0]);
-            // callbackWS(w[0], newBase)
-            // } else if (w.length === 0) {
-        }
-        // Prompt for ws selection or creation
-        // say( w.length + " workspaces for " + id + "Choose one.");
-        var table = dom.createElement('table');
-        table.setAttribute('style', 'border-collapse:separate; border-spacing: 0.5em;');
-        // const popup = window.open(undefined, '_blank', { height: 300, width:400 }, false)
-        box.appendChild(table);
-        //  Add a field for directly adding the URI yourself
-        // const hr = box.appendChild(dom.createElement('hr')) // @@
-        box.appendChild(dom.createElement('hr')); // @@
-        var p = box.appendChild(dom.createElement('p'));
-        p.style = style_1.commentStyle;
-        p.textContent = "Where would you like to store the data for the ".concat(noun, "?\n    Give the URL of the folder where you would like the data stored.\n    It can be anywhere in solid world - this URI is just an idea.");
-        // @@ TODO Remove the need to cast baseField to any
-        var baseField = box.appendChild(dom.createElement('input'));
-        baseField.setAttribute('type', 'text');
-        baseField.style = style_1.textInputStyle;
-        baseField.size = 80; // really a string
-        baseField.label = 'base URL';
-        baseField.autocomplete = 'on';
-        if (newBase) {
-            // set to default
-            baseField.value = newBase;
-        }
-        context.baseField = baseField;
-        box.appendChild(dom.createElement('br')); // @@
-        var button = box.appendChild(dom.createElement('button'));
-        button.style = style_1.buttonStyle;
-        button.textContent = "Start new ".concat(noun, " at this URI");
-        button.addEventListener('click', function (_event) {
-            var newBase = baseField.value.replace(' ', '%20'); // do not re-encode in general, as % encodings may exist
-            if (newBase.slice(-1) !== '/') {
-                newBase += '/';
-            }
-            callbackWS(null, newBase);
-        });
-        // Now go set up the table of spaces
-        // const row = 0
-        w = w.filter(function (x) {
-            return !logic_1.solidLogicSingleton.store.holds(x, ns.rdf('type'), // Ignore master workspaces
-            ns.space('MasterWorkspace'));
-        });
-        var col1, col2, col3, tr, ws, style, comment;
-        var cellStyle = 'height: 3em; margin: 1em; padding: 1em white; border-radius: 0.3em;';
-        var deselectedStyle = "".concat(cellStyle, "border: 0px;");
-        // const selectedStyle = cellStyle + 'border: 1px solid black;'
-        for (var i = 0; i < w.length; i++) {
-            ws = w[i];
-            tr = dom.createElement('tr');
-            if (i === 0) {
-                col1 = dom.createElement('td');
-                col1.setAttribute('rowspan', "".concat(w.length));
-                col1.textContent = 'Choose a workspace for this:';
-                col1.setAttribute('style', 'vertical-align:middle;');
-                tr.appendChild(col1);
-            }
-            col2 = dom.createElement('td');
-            style = logic_1.solidLogicSingleton.store.anyValue(ws, ns.ui('style'));
-            if (!style) {
-                // Otherwise make up arbitrary colour
-                var hash = function (x) {
-                    return x.split('').reduce(function (a, b) {
-                        a = (a << 5) - a + b.charCodeAt(0);
-                        return a & a;
-                    }, 0);
-                };
-                var bgcolor = "#".concat(((hash(ws.uri) & 0xffffff) | 0xc0c0c0).toString(16)); // c0c0c0  forces pale
-                style = "color: black ; background-color: ".concat(bgcolor, ";");
-            }
-            col2.setAttribute('style', deselectedStyle + style);
-            tr.target = ws.uri;
-            var label = logic_1.solidLogicSingleton.store.any(ws, ns.rdfs('label'));
-            if (!label) {
-                label = ws.uri.split('/').slice(-1)[0] || ws.uri.split('/').slice(-2)[0];
-            }
-            col2.textContent = label || '???';
-            tr.appendChild(col2);
-            if (i === 0) {
-                col3 = dom.createElement('td');
-                col3.setAttribute('rowspan', "".concat(w.length, "1"));
-                // col3.textContent = '@@@@@ remove';
-                col3.setAttribute('style', 'width:50%;');
-                tr.appendChild(col3);
+
+    var now = new Date();
+    newBaseString += "".concat(appPathSegment, "/id").concat(now.getTime(), "/"); // unique id
+
+    return newBaseString;
+  }
+
+  function displayOptions(context) {
+    // console.log('displayOptions!', context)
+    function makeNewWorkspace(_x19) {
+      return _makeNewWorkspace.apply(this, arguments);
+    } // const status = ''
+
+
+    function _makeNewWorkspace() {
+      _makeNewWorkspace = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_event) {
+        var row, cell, newBase, newWs, newData;
+        return _regenerator["default"].wrap(function _callee3$(_context3) {
+          while (1) {
+            switch (_context3.prev = _context3.next) {
+              case 0:
+                row = table.appendChild(dom.createElement('tr'));
+                cell = row.appendChild(dom.createElement('td'));
+                cell.setAttribute('colspan', '3');
+                cell.style.padding = '0.5em';
+                _context3.t0 = encodeURI;
+                _context3.next = 7;
+                return widgets.askName(dom, _logic.solidLogicSingleton.store, cell, ns.solid('URL'), ns.space('Workspace'), 'Workspace');
+
+              case 7:
+                _context3.t1 = _context3.sent;
+                newBase = (0, _context3.t0)(_context3.t1);
+                newWs = widgets.newThing(context.preferencesFile);
+                newData = [(0, _rdflib.st)(context.me, ns.space('workspace'), newWs, context.preferencesFile), // eslint-disable-next-line camelcase
+                (0, _rdflib.st)(newWs, ns.space('uriPrefix'), newBase, context.preferencesFile)];
+
+                if (_logic.solidLogicSingleton.store.updater) {
+                  _context3.next = 13;
+                  break;
+                }
+
+                throw new Error('store has no updater');
+
+              case 13:
+                _context3.next = 15;
+                return _logic.solidLogicSingleton.store.updater.update([], newData);
+
+              case 15:
+              case "end":
+                return _context3.stop();
             }
-            table.appendChild(tr);
-            comment = logic_1.solidLogicSingleton.store.any(ws, ns.rdfs('comment'));
-            comment = comment ? comment.value : 'Use this workspace';
-            col2.addEventListener('click', function (_event) {
-                col3.textContent = comment ? comment.value : '';
-                col3.setAttribute('style', deselectedStyle + style);
-                var button = dom.createElement('button');
-                button.textContent = 'Continue';
-                // button.setAttribute('style', style);
-                var newBase = figureOutBase(ws);
-                baseField.value = newBase; // show user proposed URI
-                button.addEventListener('click', function (_event) {
-                    button.disabled = true;
-                    callbackWS(ws, newBase);
-                    button.textContent = '---->';
-                }, true); // capture vs bubble
-                col3.appendChild(button);
-            }, true); // capture vs bubble
-        }
-        // last line with "Make new workspace"
-        var trLast = dom.createElement('tr');
-        col2 = dom.createElement('td');
-        col2.setAttribute('style', cellStyle);
-        col2.textContent = '+ Make a new workspace';
-        col2.addEventListener('click', makeNewWorkspace);
-        trLast.appendChild(col2);
-        table.appendChild(trLast);
-    } // displayOptions
-    // console.log('kicking off async operation')
-    logInLoadPreferences(context) // kick off async operation
-        .then(displayOptions)
-        .catch(function (err) {
-        // console.log("err from async op")
-        box.appendChild(widgets.errorMessageBlock(context.dom, err));
+          }
+        }, _callee3);
+      }));
+      return _makeNewWorkspace.apply(this, arguments);
+    }
+
+    var id = context.me;
+    var preferencesFile = context.preferencesFile;
+    var newBase = null; // A workspace specifically defined in the private preference file:
+
+    var w = _logic.solidLogicSingleton.store.each(id, ns.space('workspace'), undefined, preferencesFile); // Only trust preference file here
+    // A workspace in a storage in the public profile:
+
+
+    var storages = _logic.solidLogicSingleton.store.each(id, ns.space('storage')); // @@ No provenance requirement at the moment
+
+
+    if (w.length === 0 && storages) {
+      say("You don't seem to have any workspaces. You have ".concat(storages.length, " storage spaces."), 'white');
+      storages.map(function (s) {
+        w = w.concat(_logic.solidLogicSingleton.store.each(s, ns.ldp('contains')));
+        return w;
+      }).filter(function (file) {
+        return file.id ? ['public', 'private'].includes(file.id().toLowerCase()) : '';
+      });
+    }
+
+    if (w.length === 1) {
+      say("Workspace used: ".concat(w[0].uri), 'white'); // @@ allow user to see URI
+
+      newBase = figureOutBase(w[0]); // callbackWS(w[0], newBase)
+      // } else if (w.length === 0) {
+    } // Prompt for ws selection or creation
+    // say( w.length + " workspaces for " + id + "Choose one.");
+
+
+    var table = dom.createElement('table');
+    table.setAttribute('style', 'border-collapse:separate; border-spacing: 0.5em;'); // const popup = window.open(undefined, '_blank', { height: 300, width:400 }, false)
+
+    box.appendChild(table); //  Add a field for directly adding the URI yourself
+    // const hr = box.appendChild(dom.createElement('hr')) // @@
+
+    box.appendChild(dom.createElement('hr')); // @@
+
+    var p = box.appendChild(dom.createElement('p'));
+    p.style = _style.commentStyle;
+    p.textContent = "Where would you like to store the data for the ".concat(noun, "?\n    Give the URL of the folder where you would like the data stored.\n    It can be anywhere in solid world - this URI is just an idea."); // @@ TODO Remove the need to cast baseField to any
+
+    var baseField = box.appendChild(dom.createElement('input'));
+    baseField.setAttribute('type', 'text');
+    baseField.style = _style.textInputStyle;
+    baseField.size = 80; // really a string
+
+    baseField.label = 'base URL';
+    baseField.autocomplete = 'on';
+
+    if (newBase) {
+      // set to default
+      baseField.value = newBase;
+    }
+
+    context.baseField = baseField;
+    box.appendChild(dom.createElement('br')); // @@
+
+    var button = box.appendChild(dom.createElement('button'));
+    button.style = _style.buttonStyle;
+    button.textContent = "Start new ".concat(noun, " at this URI");
+    button.addEventListener('click', function (_event) {
+      var newBase = baseField.value.replace(' ', '%20'); // do not re-encode in general, as % encodings may exist
+
+      if (newBase.slice(-1) !== '/') {
+        newBase += '/';
+      }
+
+      callbackWS(null, newBase);
+    }); // Now go set up the table of spaces
+    // const row = 0
+
+    w = w.filter(function (x) {
+      return !_logic.solidLogicSingleton.store.holds(x, ns.rdf('type'), // Ignore master workspaces
+      ns.space('MasterWorkspace'));
     });
-    return box; // return the box element, while login proceeds
+    var col1, col2, col3, tr, ws, style, comment;
+    var cellStyle = 'height: 3em; margin: 1em; padding: 1em white; border-radius: 0.3em;';
+    var deselectedStyle = "".concat(cellStyle, "border: 0px;"); // const selectedStyle = cellStyle + 'border: 1px solid black;'
+
+    for (var i = 0; i < w.length; i++) {
+      ws = w[i];
+      tr = dom.createElement('tr');
+
+      if (i === 0) {
+        col1 = dom.createElement('td');
+        col1.setAttribute('rowspan', "".concat(w.length));
+        col1.textContent = 'Choose a workspace for this:';
+        col1.setAttribute('style', 'vertical-align:middle;');
+        tr.appendChild(col1);
+      }
+
+      col2 = dom.createElement('td');
+      style = _logic.solidLogicSingleton.store.anyValue(ws, ns.ui('style'));
+
+      if (!style) {
+        // Otherwise make up arbitrary colour
+        var hash = function hash(x) {
+          return x.split('').reduce(function (a, b) {
+            a = (a << 5) - a + b.charCodeAt(0);
+            return a & a;
+          }, 0);
+        };
+
+        var bgcolor = "#".concat((hash(ws.uri) & 0xffffff | 0xc0c0c0).toString(16)); // c0c0c0  forces pale
+
+        style = "color: black ; background-color: ".concat(bgcolor, ";");
+      }
+
+      col2.setAttribute('style', deselectedStyle + style);
+      tr.target = ws.uri;
+
+      var label = _logic.solidLogicSingleton.store.any(ws, ns.rdfs('label'));
+
+      if (!label) {
+        label = ws.uri.split('/').slice(-1)[0] || ws.uri.split('/').slice(-2)[0];
+      }
+
+      col2.textContent = label || '???';
+      tr.appendChild(col2);
+
+      if (i === 0) {
+        col3 = dom.createElement('td');
+        col3.setAttribute('rowspan', "".concat(w.length, "1")); // col3.textContent = '@@@@@ remove';
+
+        col3.setAttribute('style', 'width:50%;');
+        tr.appendChild(col3);
+      }
+
+      table.appendChild(tr);
+      comment = _logic.solidLogicSingleton.store.any(ws, ns.rdfs('comment'));
+      comment = comment ? comment.value : 'Use this workspace';
+      col2.addEventListener('click', function (_event) {
+        col3.textContent = comment ? comment.value : '';
+        col3.setAttribute('style', deselectedStyle + style);
+        var button = dom.createElement('button');
+        button.textContent = 'Continue'; // button.setAttribute('style', style);
+
+        var newBase = figureOutBase(ws);
+        baseField.value = newBase; // show user proposed URI
+
+        button.addEventListener('click', function (_event) {
+          button.disabled = true;
+          callbackWS(ws, newBase);
+          button.textContent = '---->';
+        }, true); // capture vs bubble
+
+        col3.appendChild(button);
+      }, true); // capture vs bubble
+    } // last line with "Make new workspace"
+
+
+    var trLast = dom.createElement('tr');
+    col2 = dom.createElement('td');
+    col2.setAttribute('style', cellStyle);
+    col2.textContent = '+ Make a new workspace';
+    col2.addEventListener('click', makeNewWorkspace);
+    trLast.appendChild(col2);
+    table.appendChild(trLast);
+  } // displayOptions
+  // console.log('kicking off async operation')
+
+
+  logInLoadPreferences(context) // kick off async operation
+  .then(displayOptions)["catch"](function (err) {
+    // console.log("err from async op")
+    box.appendChild(widgets.errorMessageBlock(context.dom, err));
+  });
+  return box; // return the box element, while login proceeds
 } // selectWorkspace
-exports.selectWorkspace = selectWorkspace;
+
 /**
  * Creates a new instance of an app.
  *
@@ -1625,70 +2118,121 @@ exports.selectWorkspace = selectWorkspace;
  *
  * @returns A div with a button in it for making a new app instance
  */
+
+
 function newAppInstance(dom, appDetails, callback) {
-    var gotWS = function (ws, base) {
-        // log.debug("newAppInstance: Selected workspace = " + (ws? ws.uri : 'none'))
-        callback(ws, base);
-    };
-    var div = dom.createElement('div');
-    var b = dom.createElement('button');
-    b.setAttribute('type', 'button');
-    div.appendChild(b);
-    b.innerHTML = "Make new ".concat(appDetails.noun);
-    b.addEventListener('click', function (_event) {
-        div.appendChild(selectWorkspace(dom, appDetails, gotWS));
-    }, false);
-    div.appendChild(b);
-    return div;
+  var gotWS = function gotWS(ws, base) {
+    // log.debug("newAppInstance: Selected workspace = " + (ws? ws.uri : 'none'))
+    callback(ws, base);
+  };
+
+  var div = dom.createElement('div');
+  var b = dom.createElement('button');
+  b.setAttribute('type', 'button');
+  div.appendChild(b);
+  b.innerHTML = "Make new ".concat(appDetails.noun);
+  b.addEventListener('click', function (_event) {
+    div.appendChild(selectWorkspace(dom, appDetails, gotWS));
+  }, false);
+  div.appendChild(b);
+  return div;
 }
-exports.newAppInstance = newAppInstance;
 /**
  * Retrieves whether the currently logged in user is a power user
  * and/or a developer
  */
+
+
 function getUserRoles() {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, me, preferencesFile, preferencesFileError, error_2;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _b.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, logInLoadPreferences({})];
-                case 1:
-                    _a = _b.sent(), me = _a.me, preferencesFile = _a.preferencesFile, preferencesFileError = _a.preferencesFileError;
-                    if (!preferencesFile || preferencesFileError) {
-                        throw new Error(preferencesFileError);
-                    }
-                    return [2 /*return*/, logic_1.solidLogicSingleton.store.each(me, ns.rdf('type'), null, preferencesFile.doc())];
-                case 2:
-                    error_2 = _b.sent();
-                    debug.warn('Unable to fetch your preferences - this was the error: ', error_2);
-                    return [3 /*break*/, 3];
-                case 3: return [2 /*return*/, []];
-            }
-        });
-    });
+  return _getUserRoles.apply(this, arguments);
 }
-exports.getUserRoles = getUserRoles;
 /**
  * Filters which panes should be available, based on the result of [[getUserRoles]]
  */
-function filterAvailablePanes(panes) {
-    return __awaiter(this, void 0, void 0, function () {
-        var userRoles;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, getUserRoles()];
-                case 1:
-                    userRoles = _a.sent();
-                    return [2 /*return*/, panes.filter(function (pane) { return isMatchingAudience(pane, userRoles); })];
+
+
+function _getUserRoles() {
+  _getUserRoles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee17() {
+    var _yield$logInLoadPrefe, me, preferencesFile, preferencesFileError;
+
+    return _regenerator["default"].wrap(function _callee17$(_context17) {
+      while (1) {
+        switch (_context17.prev = _context17.next) {
+          case 0:
+            _context17.prev = 0;
+            _context17.next = 3;
+            return logInLoadPreferences({});
+
+          case 3:
+            _yield$logInLoadPrefe = _context17.sent;
+            me = _yield$logInLoadPrefe.me;
+            preferencesFile = _yield$logInLoadPrefe.preferencesFile;
+            preferencesFileError = _yield$logInLoadPrefe.preferencesFileError;
+
+            if (!(!preferencesFile || preferencesFileError)) {
+              _context17.next = 9;
+              break;
             }
-        });
-    });
+
+            throw new Error(preferencesFileError);
+
+          case 9:
+            return _context17.abrupt("return", _logic.solidLogicSingleton.store.each(me, ns.rdf('type'), null, preferencesFile.doc()));
+
+          case 12:
+            _context17.prev = 12;
+            _context17.t0 = _context17["catch"](0);
+            debug.warn('Unable to fetch your preferences - this was the error: ', _context17.t0);
+
+          case 15:
+            return _context17.abrupt("return", []);
+
+          case 16:
+          case "end":
+            return _context17.stop();
+        }
+      }
+    }, _callee17, null, [[0, 12]]);
+  }));
+  return _getUserRoles.apply(this, arguments);
 }
-exports.filterAvailablePanes = filterAvailablePanes;
+
+function filterAvailablePanes(_x20) {
+  return _filterAvailablePanes.apply(this, arguments);
+}
+
+function _filterAvailablePanes() {
+  _filterAvailablePanes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee18(panes) {
+    var userRoles;
+    return _regenerator["default"].wrap(function _callee18$(_context18) {
+      while (1) {
+        switch (_context18.prev = _context18.next) {
+          case 0:
+            _context18.next = 2;
+            return getUserRoles();
+
+          case 2:
+            userRoles = _context18.sent;
+            return _context18.abrupt("return", panes.filter(function (pane) {
+              return isMatchingAudience(pane, userRoles);
+            }));
+
+          case 4:
+          case "end":
+            return _context18.stop();
+        }
+      }
+    }, _callee18);
+  }));
+  return _filterAvailablePanes.apply(this, arguments);
+}
+
 function isMatchingAudience(pane, userRoles) {
-    var audience = pane.audience || [];
-    return audience.reduce(function (isMatch, audienceRole) { return isMatch && !!userRoles.find(function (role) { return role.equals(audienceRole); }); }, true);
+  var audience = pane.audience || [];
+  return audience.reduce(function (isMatch, audienceRole) {
+    return isMatch && !!userRoles.find(function (role) {
+      return role.equals(audienceRole);
+    });
+  }, true);
 }
 //# sourceMappingURL=authn.js.map