solid-ui 2.4.19-alpha → 2.4.19-alpha-26c62441

package/dist/main.js

@@ -15167,28 +15167,26 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2022-03-27T13:54:54Z',
-  commit: '1ca42af20eb4584f2e8f64f135536ed241ebfbdc',
+  buildTime: '2022-03-29T14:22:09Z',
+  commit: '26c6244198f7f4694aa056aab5bdfab5002a7a21',
   npmInfo: {
     'solid-ui': '2.4.19-alpha',
-    npm: '8.3.1',
-    node: '16.14.0',
-    v8: '9.4.146.24-node.20',
-    uv: '1.43.0',
-    zlib: '1.2.11',
-    brotli: '1.0.9',
+    npm: '6.14.16',
     ares: '1.18.1',
-    modules: '93',
-    nghttp2: '1.45.1',
-    napi: '8',
-    llhttp: '6.0.4',
-    openssl: '1.1.1m+quic',
+    brotli: '1.0.9',
     cldr: '40.0',
     icu: '70.1',
+    llhttp: '2.1.4',
+    modules: '83',
+    napi: '8',
+    nghttp2: '1.42.0',
+    node: '14.19.0',
+    openssl: '1.1.1m',
     tz: '2021a3',
     unicode: '14.0',
-    ngtcp2: '0.1.0-DEV',
-    nghttp3: '0.1.0-DEV'
+    uv: '1.42.0',
+    v8: '8.4.371.23-node.85',
+    zlib: '1.2.11'
   }
 };
 exports.versionInfo = versionInfo;
@@ -16989,7 +16987,7 @@ function uploadFiles(fetcher, files, fileBase, imageBase, successHandler) {
         } else {
           var extension = mime.extension(theFile.type); // Note not simple: eg .mp3 => audio/mpeg; .mpga => audio/mpeg; audio/mp3 => .mp3
 
-          if (!theFile.name.endsWith('.' + extension) && // Not already has preferred extension? and ...
+          if (extension && !theFile.name.endsWith('.' + extension) && // Not already has preferred extension? and ...
           theFile.type !== mime.lookup(theFile.name)) {
             // the mime type of this ext is not the right one?
             suffix = '_.' + extension; // console.log('MIME TYPE MISMATCH: ' + mime.lookup(theFile.name) + ': adding extension: ' + suffix)
@@ -65365,11 +65363,7 @@ try {
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    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];
@@ -65516,11 +65510,7 @@ exports.authSession = new solid_client_authn_browser_1.Session({
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    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];
@@ -65711,11 +65701,7 @@ exports.SolidAuthnLogic = SolidAuthnLogic;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    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];
@@ -66112,219 +66098,6 @@ exports.determineChatContainer = determineChatContainer;
 
 /***/ }),
 
-/***/ "./node_modules/solid-logic/lib/discovery/discoveryLogic.js":
-/*!******************************************************************!*\
-  !*** ./node_modules/solid-logic/lib/discovery/discoveryLogic.js ***!
-  \******************************************************************/
-/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
-
-"use strict";
-
-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 };
-    }
-};
-Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.loadAllTypeIndexes = exports.loadCommunityTypeIndexes = exports.loadTypeIndexesFor = exports.loadPreferences = exports.loadProfile = void 0;
-var rdflib_1 = __webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js");
-var ns = {
-    solid: (0, rdflib_1.Namespace)('http://www.w3.org/ns/solid/terms#'),
-    space: (0, rdflib_1.Namespace)('http://www.w3.org/ns/pim/space#')
-};
-function loadProfile(store, user) {
-    return __awaiter(this, void 0, void 0, function () {
-        var err_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if (!user) {
-                        throw new Error("loadProfile: no user given.");
-                    }
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, store.fetcher.load(user.doc())];
-                case 2:
-                    _a.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    err_1 = _a.sent();
-                    throw new Error("Unable to load profile of user <".concat(user, ">: ").concat(err_1));
-                case 4: return [2 /*return*/, user.doc()];
-            }
-        });
-    });
-}
-exports.loadProfile = loadProfile;
-function loadPreferences(store, user) {
-    return __awaiter(this, void 0, void 0, function () {
-        var profile, preferencesFile;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, loadProfile(store, user)];
-                case 1:
-                    profile = _a.sent();
-                    preferencesFile = store.any(user, ns.space('preferencesFile'), undefined, profile);
-                    if (!preferencesFile) {
-                        // throw new Error(`USer ${user} has no pointer in profile to preferences file.`)
-                        return [2 /*return*/, undefined];
-                    }
-                    try {
-                        store.fetcher.load(preferencesFile);
-                    }
-                    catch (err) { // Mabeb a permission propblem or origin problem
-                        return [2 /*return*/, undefined
-                            // throw new Error(`Unable to load preferences file ${preferencesFile} of user <${user}>: ${err}`)
-                        ];
-                        // throw new Error(`Unable to load preferences file ${preferencesFile} of user <${user}>: ${err}`)
-                    }
-                    return [2 /*return*/, preferencesFile];
-            }
-        });
-    });
-}
-exports.loadPreferences = loadPreferences;
-function loadTypeIndexesFor(store, user) {
-    return __awaiter(this, void 0, void 0, function () {
-        var profile, publicTypeIndex, _a, pub, preferencesFile, privateTypeIndexes, priv;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (!user)
-                        throw new Error("loadTypeIndexesFor: No user given");
-                    return [4 /*yield*/, loadProfile(store, user)];
-                case 1:
-                    profile = _b.sent();
-                    publicTypeIndex = store.any(user, ns.solid('publicTypeIndex'), undefined, profile);
-                    if (!publicTypeIndex) return [3 /*break*/, 5];
-                    _b.label = 2;
-                case 2:
-                    _b.trys.push([2, 4, , 5]);
-                    return [4 /*yield*/, store.fetcher.load(publicTypeIndex)];
-                case 3:
-                    _b.sent();
-                    return [3 /*break*/, 5];
-                case 4:
-                    _a = _b.sent();
-                    return [3 /*break*/, 5];
-                case 5:
-                    pub = publicTypeIndex ? [{ label: 'public', index: publicTypeIndex, agent: user }] : [];
-                    return [4 /*yield*/, loadPreferences(store, user)];
-                case 6:
-                    preferencesFile = _b.sent();
-                    if (preferencesFile) { // watch out - can be in either as spec was not clear
-                        privateTypeIndexes = store.each(user, ns.solid('privateTypeIndex'), undefined, preferencesFile)
-                            .concat(store.each(user, ns.solid('privateTypeIndex'), undefined, profile));
-                        priv = privateTypeIndexes.length > 0 ? [{ label: 'priSo @@@@@vate', index: privateTypeIndexes[0], agent: user }] : [];
-                        return [2 /*return*/, pub.concat(priv)];
-                    }
-                    return [2 /*return*/, pub];
-            }
-        });
-    });
-}
-exports.loadTypeIndexesFor = loadTypeIndexesFor;
-function loadCommunityTypeIndexes(store, user) {
-    return __awaiter(this, void 0, void 0, function () {
-        var preferencesFile, communities, communityTypeIndexesPromise, result1;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, loadPreferences(store, user)];
-                case 1:
-                    preferencesFile = _a.sent();
-                    if (preferencesFile) {
-                        communities = store.each(user, ns.solid('community'), undefined, preferencesFile);
-                        communityTypeIndexesPromise = communities.map(function (community) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0: return [4 /*yield*/, loadTypeIndexesFor(store, community)];
-                                case 1: return [2 /*return*/, _a.sent()];
-                            }
-                        }); }); });
-                        result1 = Promise.all(communityTypeIndexesPromise);
-                        // const result2 = Promise.all(result1)
-                        // const flat = result2.flat()
-                        return [2 /*return*/, result1
-                            // const communityTypeIndexes = await Promise.all(communityTypeIndexesPromise)
-                            /*
-                          let result = [] as TypeIndex[]
-                          for(const community of communities) {
-                            result = result.concat(await loadTypeIndexesFor(store, community as NamedNode)) as TypeIndex[] // @@ how oto make functional with async?
-                          }
-                          */
-                            // return communityTypeIndexesPromise.resolve()
-                        ];
-                        // const communityTypeIndexes = await Promise.all(communityTypeIndexesPromise)
-                        /*
-                      let result = [] as TypeIndex[]
-                      for(const community of communities) {
-                        result = result.concat(await loadTypeIndexesFor(store, community as NamedNode)) as TypeIndex[] // @@ how oto make functional with async?
-                      }
-                      */
-                        // return communityTypeIndexesPromise.resolve()
-                    }
-                    return [2 /*return*/, []];
-            }
-        });
-    });
-}
-exports.loadCommunityTypeIndexes = loadCommunityTypeIndexes;
-function loadAllTypeIndexes(store, user) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0: return [4 /*yield*/, loadTypeIndexesFor(store, user)];
-                case 1:
-                    _b = (_a = (_c.sent())).concat;
-                    return [4 /*yield*/, loadCommunityTypeIndexes(store, user)];
-                case 2: return [2 /*return*/, _b.apply(_a, [(_c.sent()).flat()])];
-            }
-        });
-    });
-}
-exports.loadAllTypeIndexes = loadAllTypeIndexes;
-/*
-export async function getAppInstances (store:LiveStore, klass: NamedNode) {
-
-}
-*/
-//# sourceMappingURL=discoveryLogic.js.map
-
-/***/ }),
-
 /***/ "./node_modules/solid-logic/lib/index.js":
 /*!***********************************************!*\
   !*** ./node_modules/solid-logic/lib/index.js ***!
@@ -66334,7 +66107,7 @@ export async function getAppInstances (store:LiveStore, klass: NamedNode) {
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.profile = exports.chat = exports.store = exports.authSession = exports.authn = exports.FetchError = exports.NotFoundError = exports.SameOriginForbiddenError = exports.CrossOriginForbiddenError = exports.UnauthorizedError = exports.solidLogicSingleton = exports.getSuggestedIssuers = exports.ACL_LINK = exports.appContext = exports.offlineTestID = exports.SolidLogic = exports.loadAllTypeIndexes = exports.loadCommunityTypeIndexes = exports.loadTypeIndexesFor = exports.loadPreferences = exports.loadProfile = exports.loadIndex = exports.registerInTypeIndex = exports.loadTypeIndexes = exports.ensureTypeIndexes = exports.genACLText = exports.setACLUserPublic = void 0;
+exports.profile = exports.chat = exports.store = exports.authSession = exports.authn = exports.FetchError = exports.NotFoundError = exports.SameOriginForbiddenError = exports.CrossOriginForbiddenError = exports.UnauthorizedError = exports.solidLogicSingleton = exports.getSuggestedIssuers = exports.ACL_LINK = exports.appContext = exports.offlineTestID = exports.SolidLogic = exports.loadIndex = exports.registerInTypeIndex = exports.loadTypeIndexes = exports.ensureTypeIndexes = exports.genACLText = exports.setACLUserPublic = void 0;
 // Make these variables directly accessible as it is what you need most of the time
 // This also makes these variable globaly accesible in mashlib
 var solidLogicSingleton_1 = __webpack_require__(/*! ./logic/solidLogicSingleton */ "./node_modules/solid-logic/lib/logic/solidLogicSingleton.js");
@@ -66356,12 +66129,6 @@ Object.defineProperty(exports, "ensureTypeIndexes", ({ enumerable: true, get: fu
 Object.defineProperty(exports, "loadTypeIndexes", ({ enumerable: true, get: function () { return typeIndexLogic_1.loadTypeIndexes; } }));
 Object.defineProperty(exports, "registerInTypeIndex", ({ enumerable: true, get: function () { return typeIndexLogic_1.registerInTypeIndex; } }));
 Object.defineProperty(exports, "loadIndex", ({ enumerable: true, get: function () { return typeIndexLogic_1.loadIndex; } }));
-var discoveryLogic_1 = __webpack_require__(/*! ./discovery/discoveryLogic */ "./node_modules/solid-logic/lib/discovery/discoveryLogic.js");
-Object.defineProperty(exports, "loadProfile", ({ enumerable: true, get: function () { return discoveryLogic_1.loadProfile; } }));
-Object.defineProperty(exports, "loadPreferences", ({ enumerable: true, get: function () { return discoveryLogic_1.loadPreferences; } }));
-Object.defineProperty(exports, "loadTypeIndexesFor", ({ enumerable: true, get: function () { return discoveryLogic_1.loadTypeIndexesFor; } }));
-Object.defineProperty(exports, "loadCommunityTypeIndexes", ({ enumerable: true, get: function () { return discoveryLogic_1.loadCommunityTypeIndexes; } }));
-Object.defineProperty(exports, "loadAllTypeIndexes", ({ enumerable: true, get: function () { return discoveryLogic_1.loadAllTypeIndexes; } }));
 var SolidLogic_1 = __webpack_require__(/*! ./logic/SolidLogic */ "./node_modules/solid-logic/lib/logic/SolidLogic.js");
 Object.defineProperty(exports, "SolidLogic", ({ enumerable: true, get: function () { return SolidLogic_1.SolidLogic; } }));
 var authUtil_1 = __webpack_require__(/*! ./authn/authUtil */ "./node_modules/solid-logic/lib/authn/authUtil.js");
@@ -66540,11 +66307,7 @@ exports.FetchError = FetchError;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    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];
@@ -66610,62 +66373,51 @@ var ProfileLogic_1 = __webpack_require__(/*! ../profile/ProfileLogic */ "./node_
 var debug = __importStar(__webpack_require__(/*! ../util/debug */ "./node_modules/solid-logic/lib/util/debug.js"));
 var UtilityLogic_1 = __webpack_require__(/*! ../util/UtilityLogic */ "./node_modules/solid-logic/lib/util/UtilityLogic.js");
 var CustomError_1 = __webpack_require__(/*! ./CustomError */ "./node_modules/solid-logic/lib/logic/CustomError.js");
-var solidLogicSingleton_1 = __webpack_require__(/*! ../logic/solidLogicSingleton */ "./node_modules/solid-logic/lib/logic/solidLogicSingleton.js");
-/*
-** It is important to distinquish `fetch`, a function provided by the browser
-** and `Fetcher`, a helper object for the rdflib Store which turns it
-** into a `ConnectedStore` or a `LiveStore`.  A Fetcher object is
-** available at store.fetcher, and `fetch` function at `store.fetcher._fetch`,
-*/
 var ns = (0, solid_namespace_1.default)(rdf);
 var SolidLogic = /** @class */ (function () {
-    function SolidLogic(specialFetch, session) {
-        // would xpect to be able to do it this way: but get TypeError:  Failed to execute 'fetch' on 'Window': Illegal invocation status: 999
-        // this.store = new rdf.LiveStore({})
-        // this.store.fetcher._fetch = fetch
-        console.log("SolidLogic: Unique instance created.  There should only be one of these.");
+    function SolidLogic(fetcher, session) {
         this.store = rdf.graph(); // Make a Quad store
-        rdf.fetcher(this.store, { fetch: specialFetch.fetch }); // Attach a web I/O module, store.fetcher
+        rdf.fetcher(this.store, fetcher); // Attach a web I/O module, store.fetcher
         this.store.updater = new rdf.UpdateManager(this.store); // Add real-time live updates store.updater
         this.store.features = []; // disable automatic node merging on store load
         this.cache = {
             profileDocument: {},
             preferencesFile: {},
         };
-        this.underlyingFetch = { fetch: fetch }; // Note global one not the one passed
+        this.fetcher = fetcher;
         this.authn = new SolidAuthnLogic_1.SolidAuthnLogic(session);
         debug.log('SolidAuthnLogic initialized');
         this.profile = new ProfileLogic_1.ProfileLogic(this.store, ns, this.authn);
         this.chat = new ChatLogic_1.ChatLogic(this.store, ns, this.profile);
-        this.util = new UtilityLogic_1.UtilityLogic(this.store, ns, this.underlyingFetch);
+        this.util = new UtilityLogic_1.UtilityLogic(this.store, ns, this.fetcher);
     }
     SolidLogic.prototype.findAclDocUrl = function (url) {
         return this.util.findAclDocUrl(url);
     };
+    SolidLogic.prototype.loadDoc = function (doc) {
+        return this.util.loadDoc(doc);
+    };
     SolidLogic.prototype.loadProfile = function (me) {
         return __awaiter(this, void 0, void 0, function () {
             var profileDocument, err_1, message;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        /*
-                      // console.log('loadProfile cache ', this.cache)
+                        // console.log('loadProfile', me)
                         if (this.cache.profileDocument[me.value]) {
-                        return this.cache.profileDocument[me.value];
-                      }    @@ just use the cache in the store
-                        */
-                        console.log('loadProfile  me ', me);
-                        profileDocument = me.doc();
+                            return [2 /*return*/, this.cache.profileDocument[me.value]];
+                        }
                         _a.label = 1;
                     case 1:
                         _a.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.store.fetcher.load(profileDocument)];
+                        profileDocument = me.doc();
+                        return [4 /*yield*/, this.loadDoc(profileDocument)];
                     case 2:
                         _a.sent();
                         return [2 /*return*/, profileDocument];
                     case 3:
                         err_1 = _a.sent();
-                        message = "Cannot load profile ".concat(profileDocument, " : ").concat(err_1);
+                        message = "Logged in but cannot load profile ".concat(profileDocument, " : ").concat(err_1);
                         throw new Error(message);
                     case 4: return [2 /*return*/];
                 }
@@ -66689,27 +66441,27 @@ var SolidLogic = /** @class */ (function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        console.log('loadPreferences cache ', this.cache);
+                        // console.log('loadPreferences', me)
                         if (this.cache.preferencesFile[me.value]) {
                             return [2 /*return*/, this.cache.preferencesFile[me.value]];
                         }
-                        return [4 /*yield*/, this.loadProfile(me)]; // Load pointer to pref file
-                    case 1:
-                        _a.sent(); // Load pointer to pref file
-                        preferencesFile = this.store.any(me, ns.space('preferencesFile'), null, me.doc());
+                        preferencesFile = this.store.any(me, ns.space("preferencesFile"));
                         if (!preferencesFile) {
                             throw new Error("Can't find a preference file pointer in profile ".concat(me.doc()));
                         }
-                        _a.label = 2;
-                    case 2:
-                        _a.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, solidLogicSingleton_1.solidLogicSingleton.store.fetcher.load(preferencesFile, {
+                        if (!this.store.fetcher) {
+                            throw new Error("Cannot load doc, have no fetcher");
+                        }
+                        _a.label = 1;
+                    case 1:
+                        _a.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, this.store.fetcher.load(preferencesFile, {
                                 withCredentials: true,
                             })];
-                    case 3:
+                    case 2:
                         _a.sent();
-                        return [3 /*break*/, 5];
-                    case 4:
+                        return [3 /*break*/, 4];
+                    case 3:
                         err_2 = _a.sent();
                         status_1 = err_2.status;
                         debug.log("HTTP status ".concat(status_1, " for preference file ").concat(preferencesFile));
@@ -66726,7 +66478,7 @@ var SolidLogic = /** @class */ (function () {
                             throw new CustomError_1.NotFoundError(preferencesFile.value);
                         }
                         throw new CustomError_1.FetchError(err_2.status, err_2.message);
-                    case 5: return [2 /*return*/, preferencesFile];
+                    case 4: return [2 /*return*/, preferencesFile];
                 }
             });
         });
@@ -66744,6 +66496,9 @@ var SolidLogic = /** @class */ (function () {
         });
     };
     SolidLogic.prototype.load = function (doc) {
+        if (!this.store.fetcher) {
+            throw new Error("Cannot load doc(s), have no fetcher");
+        }
         return this.store.fetcher.load(doc);
     };
     SolidLogic.prototype.loadIndexes = function (me, publicProfile, preferencesFile, onWarning) {
@@ -66803,10 +66558,14 @@ var SolidLogic = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.store.fetcher.webOperation("PUT", doc.uri, {
-                            data: "# ".concat(new Date(), " ").concat(comment, "\n    "),
-                            contentType: "text/turtle",
-                        })];
+                    case 0:
+                        if (!this.store.fetcher) {
+                            throw new Error("Cannot create empty rdf doc, have no fetcher");
+                        }
+                        return [4 /*yield*/, this.store.fetcher.webOperation("PUT", doc.uri, {
+                                data: "# ".concat(new Date(), " ").concat(comment, "\n    "),
+                                contentType: "text/turtle",
+                            })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -66819,6 +66578,9 @@ var SolidLogic = /** @class */ (function () {
         var _this = this;
         if (ins === void 0) { ins = []; }
         return new Promise(function (resolve, reject) {
+            if (!_this.store.updater) {
+                throw new Error("Cannot updatePromise, have no updater");
+            }
             _this.store.updater.update(del, ins, function (_uri, ok, errorBody) {
                 if (!ok) {
                     reject(new Error(errorBody));
@@ -66851,7 +66613,7 @@ var SolidLogic = /** @class */ (function () {
     SolidLogic.prototype.fetch = function (url, options) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
-                return [2 /*return*/, this.underlyingFetch.fetch(url, options)];
+                return [2 /*return*/, this.fetcher.fetch(url, options)];
             });
         });
     };
@@ -66872,11 +66634,7 @@ exports.SolidLogic = SolidLogic;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    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];
@@ -66935,11 +66693,8 @@ var debug = __importStar(__webpack_require__(/*! ../util/debug */ "./node_module
 var authSession_1 = __webpack_require__(/*! ../authSession/authSession */ "./node_modules/solid-logic/lib/authSession/authSession.js");
 var SolidLogic_1 = __webpack_require__(/*! ./SolidLogic */ "./node_modules/solid-logic/lib/logic/SolidLogic.js");
 var _fetch = function (url, requestInit) { return __awaiter(void 0, void 0, void 0, function () {
-    var omitCreds;
     return __generator(this, function (_a) {
-        omitCreds = requestInit && requestInit.credentials && requestInit.credentials == 'omit';
-        if (authSession_1.authSession.info.webId && !omitCreds) { // see https://github.com/solid/solidos/issues/114
-            // In fact ftech should respect crentials omit itself
+        if (authSession_1.authSession.info.webId) {
             return [2 /*return*/, authSession_1.authSession.fetch(url, requestInit)];
         }
         else {
@@ -67072,11 +66827,7 @@ exports.ProfileLogic = ProfileLogic;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
+    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];
@@ -67140,35 +66891,11 @@ var solid_namespace_1 = __importDefault(__webpack_require__(/*! solid-namespace
 var $rdf = __importStar(__webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js"));
 var uri_1 = __webpack_require__(/*! ../util/uri */ "./node_modules/solid-logic/lib/util/uri.js");
 var solidLogicSingleton_1 = __webpack_require__(/*! ../logic/solidLogicSingleton */ "./node_modules/solid-logic/lib/logic/solidLogicSingleton.js");
-// import { ensureLoadedPreferences } from '../logic/logic'
-var discoveryLogic_1 = __webpack_require__(/*! ../discovery/discoveryLogic */ "./node_modules/solid-logic/lib/discovery/discoveryLogic.js");
 exports.ns = (0, solid_namespace_1.default)($rdf);
-var store = solidLogicSingleton_1.solidLogicSingleton.store;
-function ensureLoadedPreferences(context) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, _b;
-        return __generator(this, function (_c) {
-            switch (_c.label) {
-                case 0:
-                    if (!context.me)
-                        throw new Error('@@ ensureLoadedPreferences: no user specified');
-                    _a = context;
-                    return [4 /*yield*/, (0, discoveryLogic_1.loadProfile)(store, context.me)];
-                case 1:
-                    _a.publicProfile = _c.sent();
-                    _b = context;
-                    return [4 /*yield*/, (0, discoveryLogic_1.loadPreferences)(store, context.me)];
-                case 2:
-                    _b.preferencesFile = _c.sent();
-                    return [2 /*return*/, context];
-            }
-        });
-    });
-}
 /**
  * Resolves with the same context, outputting
  * output: index.public, index.private
- *  @@ This is a very bizare function
+ *
  * @see https://github.com/solid/solid/blob/main/proposals/data-discovery.md#discoverability
  */
 function loadIndex(context, isPublic) {
@@ -67185,8 +66912,8 @@ function loadIndex(context, isPublic) {
                 case 1:
                     indexes = _a.sent();
                     context.index = context.index || {};
-                    context.index.private = indexes.private.concat(context.index.private);
-                    context.index.public = indexes.public.concat(context.index.public);
+                    context.index.private = indexes.private || context.index.private;
+                    context.index.public = indexes.public || context.index.public;
                     return [2 /*return*/, context];
             }
         });
@@ -67195,36 +66922,21 @@ function loadIndex(context, isPublic) {
 exports.loadIndex = loadIndex;
 function loadTypeIndexes(context) {
     return __awaiter(this, void 0, void 0, function () {
-        var error_1, indexes, error_2;
+        var indexes;
         var _this = this;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, (0, discoveryLogic_1.loadPreferences)(solidLogicSingleton_1.solidLogicSingleton.store, context.me)];
+                case 0: return [4 /*yield*/, solidLogicSingleton_1.solidLogicSingleton.loadIndexes(context.me, context.publicProfile || null, context.preferencesFile || null, 
+                    // async (err: Error) => widgets.complain(context, err.message)
+                    function (err) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, debug.warn(err.message)];
+                    }); }); })];
                 case 1:
-                    _a.sent();
-                    return [3 /*break*/, 3];
-                case 2:
-                    error_1 = _a.sent();
-                    debug.warn(error_1.message);
-                    return [3 /*break*/, 3];
-                case 3:
-                    _a.trys.push([3, 5, , 6]);
-                    return [4 /*yield*/, solidLogicSingleton_1.solidLogicSingleton.loadIndexes(context.me, context.publicProfile || null, context.preferencesFile || null)];
-                case 4:
                     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];
-                case 5:
-                    error_2 = _a.sent();
-                    (function (error) { return __awaiter(_this, void 0, void 0, function () { return __generator(this, function (_a) {
-                        return [2 /*return*/, debug.warn(error.message)];
-                    }); }); });
-                    return [3 /*break*/, 6];
-                case 6: return [2 /*return*/];
             }
         });
     });
@@ -67234,18 +66946,14 @@ 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, agent) {
+function ensureTypeIndexes(context) {
     return __awaiter(this, void 0, void 0, function () {
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0:
-                    if (!context.me) {
-                        throw new Error("ensureTypeIndexes: @@ no user");
-                    }
-                    return [4 /*yield*/, ensureOneTypeIndex(context, true, agent)];
+                case 0: return [4 /*yield*/, ensureOneTypeIndex(context, true)];
                 case 1:
                     _a.sent();
-                    return [4 /*yield*/, ensureOneTypeIndex(context, false, agent)];
+                    return [4 /*yield*/, ensureOneTypeIndex(context, false)];
                 case 2:
                     _a.sent();
                     return [2 /*return*/, context];
@@ -67262,7 +66970,7 @@ exports.ensureTypeIndexes = ensureTypeIndexes;
  * Adds its output to the context
  * @see https://github.com/solid/solid/blob/main/proposals/data-discovery.md#discoverability
  */
-function ensureOneTypeIndex(context, isPublic, agent) {
+function ensureOneTypeIndex(context, isPublic) {
     return __awaiter(this, void 0, void 0, function () {
         function makeIndexIfNecessary(context, isPublic) {
             return __awaiter(this, void 0, void 0, function () {
@@ -67293,16 +67001,10 @@ function ensureOneTypeIndex(context, isPublic, agent) {
                     switch (_a.label) {
                         case 0:
                             relevant = isPublic ? context.publicProfile : context.preferencesFile;
-                            if (!relevant)
-                                alert('@@@@ relevent null');
                             visibility = isPublic ? 'public' : 'private';
                             context.index = context.index || {};
                             context.index[visibility] = context.index[visibility] || [];
                             if (!(context.index[visibility].length === 0)) return [3 /*break*/, 6];
-                            if (!store.updater.editable(relevant)) {
-                                debug.log("Not adding new type index as ".concat(relevant, " is not editable"));
-                                return [2 /*return*/];
-                            }
                             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?"))) {
@@ -67351,41 +67053,29 @@ function ensureOneTypeIndex(context, isPublic, agent) {
                 });
             });
         } // makeIndexIfNecessary
-        var context2, relevant, pp, error_3;
+        var error_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, ensureLoadedPreferences(context)];
+                case 0:
+                    _a.trys.push([0, 2, , 4]);
+                    return [4 /*yield*/, loadIndex(context, isPublic)];
                 case 1:
-                    context2 = _a.sent();
-                    if (!context2.publicProfile)
-                        throw new Error("@@ type index: no publicProfile");
-                    if (!context2.preferencesFile)
-                        throw new Error("@@ type index: no preferencesFile for profile  ".concat(context2.publicProfile));
-                    relevant = isPublic ? context2.publicProfile : context2.preferencesFile;
-                    _a.label = 2;
-                case 2:
-                    _a.trys.push([2, 5, , 7]);
-                    return [4 /*yield*/, loadIndex(context2, isPublic)];
-                case 3:
                     _a.sent();
-                    pp = isPublic ? 'public' : 'private';
-                    if (context2.index && context2.index[pp] && context2.index[pp].length > 0) {
-                        debug.log("ensureOneTypeIndex: Type index exists already ".concat(context2.index[pp]));
-                        return [2 /*return*/, context2];
+                    if (context.index) {
+                        debug.log("ensureOneTypeIndex: Type index exists already ".concat(isPublic
+                            ? context.index.public[0]
+                            : context.index.private[0]));
                     }
-                    return [4 /*yield*/, makeIndexIfNecessary(context2, isPublic)];
-                case 4:
-                    _a.sent();
-                    return [3 /*break*/, 7];
-                case 5:
-                    error_3 = _a.sent();
-                    return [4 /*yield*/, makeIndexIfNecessary(context2, isPublic)
-                        // widgets.complain(context2, 'calling loadIndex:' + error)
+                    return [2 /*return*/, context];
+                case 2:
+                    error_1 = _a.sent();
+                    return [4 /*yield*/, makeIndexIfNecessary(context, isPublic)
+                        // widgets.complain(context, 'calling loadIndex:' + error)
                     ];
-                case 6:
+                case 3:
                     _a.sent();
-                    return [3 /*break*/, 7];
-                case 7: return [2 /*return*/];
+                    return [3 /*break*/, 4];
+                case 4: return [2 /*return*/];
             }
         });
     });
@@ -67394,13 +67084,12 @@ function ensureOneTypeIndex(context, isPublic, agent) {
  * Register a new app in a type index
  * used in chat in bookmark.js (solid-ui)
  */
-function registerInTypeIndex(context, instance, theClass, isPublic, agent // Defaults to current user
-) {
+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, agent)];
+                case 0: return [4 /*yield*/, ensureOneTypeIndex(context, isPublic)];
                 case 1:
                     _a.sent();
                     if (!context.index) {
@@ -67492,10 +67181,10 @@ exports.ACL_LINK = (0, rdflib_1.sym)("http://www.iana.org/assignments/link-relat
  * Utility-related logic
  */
 var UtilityLogic = /** @class */ (function () {
-    function UtilityLogic(store, ns, underlyingFetch) {
+    function UtilityLogic(store, ns, fetcher) {
         this.store = store;
         this.ns = ns;
-        this.underlyingFetch = underlyingFetch;
+        this.fetcher = fetcher;
     }
     UtilityLogic.prototype.findAclDocUrl = function (url) {
         var _a;
@@ -67554,7 +67243,7 @@ var UtilityLogic = /** @class */ (function () {
                         return [4 /*yield*/, this.findAclDocUrl(options.target)];
                     case 1:
                         aclDocUrl = _a.sent();
-                        return [2 /*return*/, this.underlyingFetch.fetch(aclDocUrl, {
+                        return [2 /*return*/, this.fetcher.fetch(aclDocUrl, {
                                 method: 'PUT',
                                 body: str,
                                 headers: [
@@ -67600,7 +67289,7 @@ var UtilityLogic = /** @class */ (function () {
                         if (!this.isContainer(url)) {
                             throw new Error("Not a container URL ".concat(url));
                         }
-                        return [4 /*yield*/, this.underlyingFetch.fetch(url, {
+                        return [4 /*yield*/, this.fetcher.fetch(url, {
                                 method: "PUT",
                                 headers: {
                                     "Content-Type": "text/turtle",
@@ -67653,7 +67342,7 @@ var UtilityLogic = /** @class */ (function () {
                         return [4 /*yield*/, this.findAclDocUrl(url)];
                     case 1:
                         aclDocUrl = _a.sent();
-                        return [4 /*yield*/, this.underlyingFetch.fetch(aclDocUrl, { method: "DELETE" })];
+                        return [4 /*yield*/, this.fetcher.fetch(aclDocUrl, { method: "DELETE" })];
                     case 2:
                         _a.sent();
                         return [4 /*yield*/, this.getContainerMembers(url)];
@@ -67663,7 +67352,7 @@ var UtilityLogic = /** @class */ (function () {
                     case 4:
                         _a.sent();
                         _a.label = 5;
-                    case 5: return [2 /*return*/, this.underlyingFetch.fetch(url, { method: "DELETE" })];
+                    case 5: return [2 /*return*/, this.fetcher.fetch(url, { method: "DELETE" })];
                     case 6:
                         e_1 = _a.sent();
                         return [3 /*break*/, 7];