solid-ui 3.0.4-729805d → 3.0.4-7c010e4

package/dist/solid-ui.js

@@ -9522,6 +9522,13 @@ var _solidLogicSingleton$2 = external_SolidLogic_.solidLogicSingleton.typeIndex,
   loadAllTypeIndexes = _solidLogicSingleton$2.loadAllTypeIndexes,
   getScopedAppsFromIndex = _solidLogicSingleton$2.getScopedAppsFromIndex,
   deleteTypeIndexRegistration = _solidLogicSingleton$2.deleteTypeIndexRegistration;
+function formatDynamicError(error, contextLabel) {
+  var e = error;
+  var name = (e === null || e === void 0 ? void 0 : e.name) || 'Error';
+  var status = typeof (e === null || e === void 0 ? void 0 : e.status) === 'number' ? " (HTTP ".concat(e.status, ")") : '';
+  var message = e !== null && e !== void 0 && e.message ? String(e.message) : typeof error === 'string' ? error : 'No additional details provided';
+  return "".concat(contextLabel, ": ").concat(name).concat(status, " - ").concat(message);
+}
 
 /**
  * Resolves with the logged in user's WebID
@@ -9592,78 +9599,100 @@ function _ensureLoadedPreferences() {
           return ensureLoadedProfile(context);
         case 2:
           context = _context4.sent;
-          _context4.next = 3;
-          return loadPreferences(context.me);
+          if (context.me) {
+            _context4.next = 3;
+            break;
+          }
+          context.preferencesFileError = 'Not logged in, so preferences were not loaded.';
+          return _context4.abrupt("return", context);
         case 3:
+          _context4.next = 4;
+          return loadPreferences(context.me);
+        case 4:
           preferencesFile = _context4.sent;
           if (progressDisplay) {
             progressDisplay.parentNode.removeChild(progressDisplay);
           }
           context.preferencesFile = preferencesFile;
-          _context4.next = 11;
+          _context4.next = 13;
           break;
-        case 4:
-          _context4.prev = 4;
+        case 5:
+          _context4.prev = 5;
           _t4 = _context4["catch"](1);
           if (!(_t4 instanceof external_SolidLogic_.UnauthorizedError)) {
-            _context4.next = 5;
-            break;
-          }
-          m2 = 'Oops — you are not authenticated (properly logged in), so SolidOS cannot read your preferences file. Try logging out and then logging back in.';
-          log_alert(m2);
-          _context4.next = 11;
-          break;
-        case 5:
-          if (!(_t4 instanceof external_SolidLogic_.CrossOriginForbiddenError)) {
             _context4.next = 6;
             break;
           }
-          m2 = "Unauthorized: Assuming preference file blocked for origin ".concat(window.location.origin);
+          m2 = 'Oops — you are not authenticated (properly logged in), so SolidOS cannot read your preferences file. Try logging out and then logging back in.';
           context.preferencesFileError = m2;
+          log_alert(m2);
           return _context4.abrupt("return", context);
         case 6:
-          if (!(_t4 instanceof external_SolidLogic_.SameOriginForbiddenError)) {
+          if (!(_t4 instanceof external_SolidLogic_.CrossOriginForbiddenError)) {
             _context4.next = 7;
             break;
           }
-          m2 = 'You are not authorized to read your preference file. This may be because you are using an untrusted web app.';
-          src_debug/* warn */.R8(m2);
+          m2 = "Unauthorized: preference file request was blocked for origin ".concat(window.location.origin, ".");
+          context.preferencesFileError = m2;
           return _context4.abrupt("return", context);
         case 7:
-          if (!(_t4 instanceof external_SolidLogic_.NotEditableError)) {
+          if (!(_t4 instanceof external_SolidLogic_.SameOriginForbiddenError)) {
             _context4.next = 8;
             break;
           }
-          m2 = 'You are not authorized to edit your preference file. This may be because you are using an untrusted web app.';
+          m2 = 'You are not authorized to read your preference file from this app context.';
+          context.preferencesFileError = m2;
           src_debug/* warn */.R8(m2);
           return _context4.abrupt("return", context);
         case 8:
-          if (!(_t4 instanceof external_SolidLogic_.WebOperationError)) {
+          if (!(_t4 instanceof external_SolidLogic_.NotEditableError)) {
             _context4.next = 9;
             break;
           }
-          m2 = 'You are not authorized to edit your preference file. This may be because you are using an untrusted web app.';
+          m2 = 'You are not authorized to edit your preference file from this app context.';
+          context.preferencesFileError = m2;
           src_debug/* warn */.R8(m2);
-          _context4.next = 11;
-          break;
+          return _context4.abrupt("return", context);
         case 9:
-          if (!(_t4 instanceof external_SolidLogic_.FetchError)) {
+          if (!(_t4 instanceof external_SolidLogic_.WebOperationError)) {
             _context4.next = 10;
             break;
           }
-          m2 = "Strange: Error ".concat(_t4.status, " trying to read your preference file.").concat(_t4.message);
-          log_alert(m2);
-          _context4.next = 11;
-          break;
+          m2 = formatDynamicError(_t4, 'Preference file web operation failed');
+          context.preferencesFileError = m2;
+          src_debug/* warn */.R8(m2);
+          return _context4.abrupt("return", context);
         case 10:
-          throw new Error("(via loadPrefs) ".concat(_t4));
+          if (!(_t4 instanceof external_SolidLogic_.FetchError)) {
+            _context4.next = 12;
+            break;
+          }
+          if (!(_t4.status === 404)) {
+            _context4.next = 11;
+            break;
+          }
+          m2 = 'Your preferences file was not found (404). It may not exist yet.';
+          context.preferencesFileError = m2;
+          src_debug/* warn */.R8(m2);
+          return _context4.abrupt("return", context);
         case 11:
+          m2 = formatDynamicError(_t4, 'Error reading your preferences file');
+          context.preferencesFileError = m2;
+          src_debug/* warn */.R8(m2);
+          log_alert(m2);
           return _context4.abrupt("return", context);
         case 12:
+          m2 = formatDynamicError(_t4, 'Unexpected error while loading preferences');
+          context.preferencesFileError = m2;
+          src_debug/* error */.z3(m2);
+          return _context4.abrupt("return", context);
+        case 13:
+          return _context4.abrupt("return", context);
+        case 14:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[1, 4]]);
+    }, _callee4, null, [[1, 5]]);
   }));
   return _ensureLoadedPreferences.apply(this, arguments);
 }
@@ -9678,7 +9707,7 @@ function ensureLoadedProfile(_x2) {
   */
 function _ensureLoadedProfile() {
   _ensureLoadedProfile = asyncToGenerator_asyncToGenerator(/*#__PURE__*/regenerator_default().mark(function _callee5(context) {
-    var logInContext, _t5;
+    var logInContext, message, _message, _t5;
     return regenerator_default().wrap(function (_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
@@ -9697,7 +9726,9 @@ function _ensureLoadedProfile() {
             _context5.next = 3;
             break;
           }
-          throw new Error('Could not log in');
+          message = 'Could not log in; skipping profile load.';
+          src_debug/* log */.Rm(message);
+          return _context5.abrupt("return", context);
         case 3:
           _context5.next = 4;
           return loadProfile(logInContext.me);
@@ -9708,10 +9739,11 @@ function _ensureLoadedProfile() {
         case 5:
           _context5.prev = 5;
           _t5 = _context5["catch"](1);
+          _message = formatDynamicError(_t5, 'Unable to load your profile');
           if (context.div && context.dom) {
-            context.div.appendChild(errorMessageBlock(context.dom, _t5.message));
+            context.div.appendChild(errorMessageBlock(context.dom, _message));
           }
-          throw new Error("Can't log in: ".concat(_t5));
+          throw new Error(_message);
         case 6:
           return _context5.abrupt("return", context);
         case 7:
@@ -10633,7 +10665,7 @@ function getUserRoles() {
  */
 function _getUserRoles() {
   _getUserRoles = asyncToGenerator_asyncToGenerator(/*#__PURE__*/regenerator_default().mark(function _callee0() {
-    var _yield$ensureLoadedPr, me, preferencesFile, preferencesFileError, _t0;
+    var _yield$ensureLoadedPr, me, preferencesFile, preferencesFileError, authState, _t0;
     return regenerator_default().wrap(function (_context1) {
       while (1) switch (_context1.prev = _context1.next) {
         case 0:
@@ -10645,23 +10677,30 @@ function _getUserRoles() {
           me = _yield$ensureLoadedPr.me;
           preferencesFile = _yield$ensureLoadedPr.preferencesFile;
           preferencesFileError = _yield$ensureLoadedPr.preferencesFileError;
-          if (!(!preferencesFile || preferencesFileError)) {
+          if (!preferencesFileError) {
             _context1.next = 2;
             break;
           }
           throw new Error(preferencesFileError);
         case 2:
-          return _context1.abrupt("return", external_SolidLogic_.solidLogicSingleton.store.each(me, src_ns.rdf('type'), null, preferencesFile.doc()));
+          if (preferencesFile) {
+            _context1.next = 3;
+            break;
+          }
+          authState = me ? "logged in as ".concat(me.value || me.uri) : 'not logged in';
+          throw new Error("Preferences file unavailable (".concat(authState, ")"));
         case 3:
-          _context1.prev = 3;
+          return _context1.abrupt("return", external_SolidLogic_.solidLogicSingleton.store.each(me, src_ns.rdf('type'), null, preferencesFile.doc()));
+        case 4:
+          _context1.prev = 4;
           _t0 = _context1["catch"](0);
-          src_debug/* warn */.R8('Unable to fetch your preferences - this was the error: ', _t0);
+          src_debug/* warn */.R8(formatDynamicError(_t0, 'Unable to fetch your preferences'));
           return _context1.abrupt("return", []);
-        case 4:
+        case 5:
         case "end":
           return _context1.stop();
       }
-    }, _callee0, null, [[0, 3]]);
+    }, _callee0, null, [[0, 4]]);
   }));
   return _getUserRoles.apply(this, arguments);
 }