solid-ui 2.4.28-21f105c8 → 2.4.28-4687e65a

package/dist/solid-ui.js

@@ -4127,32 +4127,39 @@ function _infiniteMessageArea() {
                     date = extremity.messageTable.date; // day in mssecs
                     // Are we at the top of a thread?
                     if (!(backwards && earliest.limit && date <= earliest.limit)) {
-                      _context4.next = 4;
+                      _context4.next = 7;
                       break;
                     }
+                    if (liveMessageTable) {
+                      _context4.next = 6;
+                      break;
+                    }
+                    _context4.next = 6;
+                    return appendCurrentMessages();
+                  case 6:
                     return _context4.abrupt("return", true);
-                  case 4:
+                  case 7:
                     debug.log(' insertPreviousMessages:  loadPrevious given date ' + date);
-                    _context4.next = 7;
+                    _context4.next = 10;
                     return dateFolder.loadPrevious(date, backwards);
-                  case 7:
+                  case 10:
                     date = _context4.sent;
                     // backwards
                     debug.log(' insertPreviousMessages:  loadPrevious returns date ' + date);
                     debug.log("insertPreviousMessages: from ".concat(backwards ? 'backwards' : 'forwards', " loadPrevious: ").concat(date));
                     if (!(!date && !backwards && !liveMessageTable)) {
-                      _context4.next = 13;
+                      _context4.next = 16;
                       break;
                     }
-                    _context4.next = 13;
+                    _context4.next = 16;
                     return appendCurrentMessages();
-                  case 13:
+                  case 16:
                     if (date) {
-                      _context4.next = 15;
+                      _context4.next = 18;
                       break;
                     }
                     return _context4.abrupt("return", true);
-                  case 15:
+                  case 18:
                     // done
                     live = false;
                     if (!backwards) {
@@ -4160,9 +4167,9 @@ function _infiniteMessageArea() {
                       doc = dateFolder.leafDocumentFromDate(date);
                       live = doc.sameTerm(todayDoc); // Is this todays?
                     }
-                    _context4.next = 19;
+                    _context4.next = 22;
                     return createMessageTable(date, live);
-                  case 19:
+                  case 22:
                     newMessageTable = _context4.sent;
                     extremity.messageTable = newMessageTable; // move pointer to earliest
                     if (backwards ? newestFirst : !newestFirst) {
@@ -4173,7 +4180,7 @@ function _infiniteMessageArea() {
                       div.insertBefore(newMessageTable, div.firstChild);
                     }
                     return _context4.abrupt("return", live);
-                  case 23:
+                  case 26:
                   case "end":
                     return _context4.stop();
                 }
@@ -4848,13 +4855,13 @@ function _renderMessageRow() {
           if (straightReplies.length > 1) {
             debug.log('renderMessageRow: found normal replies: ', straightReplies);
           }
-          debug.log('@@@@ alain thread');
-          // debug.log(replies)
-          // debug.log(thread)
-          thread = _solidLogic.store.any(msgId, ns.sioc('has_reply')); // if (!thread)
-          debug.log(thread);
+          debug.log('@@@@ is thread');
+          if (!thread) {
+            // thread = store.any(message, ns.sioc('has_reply'))
+            thread = _solidLogic.store.any(null, ns.sioc('has_member'), message);
+          }
           // get signature
-          signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "proofValue"))); // set message object
+          signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "proofValue"))); // set proof message object
           msg = (0, _signature.getBlankMsg)();
           msg.id = msgId.uri;
           msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
@@ -4880,9 +4887,9 @@ function _renderMessageRow() {
               else if (signature !== null && signature !== void 0 && signature.value && !(0, _signature.verifySignature)(signature === null || signature === void 0 ? void 0 : signature.value, msg, publicKey)) debug.warn('invalid signature\n' + msg.id);
             });
           }
-          _context10.next = 39;
+          _context10.next = 38;
           return (0, _chatLogic.originalVersion)(message);
-        case 39:
+        case 38:
           originalMessage = _context10.sent;
           edited = !message.sameTerm(originalMessage); // @@ load it first  @@   Or display the new data at the old date.
           // @@@ kludge!
@@ -4939,9 +4946,9 @@ function _renderMessageRow() {
             bgcolor = colorizeByAuthor ? pad.lightColorHash(creator) : getBgColor(fresh);
             para.setAttribute('style', messageBodyStyle + 'background-color: ' + bgcolor + ';');
           }
-          _context10.next = 60;
+          _context10.next = 59;
           return (0, _messageTools.sentimentStripLinked)(message, message.doc());
-        case 60:
+        case 59:
           strip = _context10.sent;
           if (strip.children.length) {
             td2.appendChild(dom.createElement('br'));
@@ -5006,7 +5013,7 @@ function _renderMessageRow() {
             }));
           }
           return _context10.abrupt("return", messageRow);
-        case 69:
+        case 68:
         case "end":
           return _context10.stop();
       }
@@ -14025,176 +14032,96 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var debug = _interopRequireWildcard(__webpack_require__(/*! ../../debug */ "./lib/debug.js"));
 var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
 var ns = _interopRequireWildcard(__webpack_require__(/*! ../../ns */ "./lib/ns.js"));
+var _otherHelpers = __webpack_require__(/*! ./otherHelpers */ "./lib/utils/keyHelpers/otherHelpers.js");
 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; }
-/* export const getPodRoot = async (webId: NamedNode) => {
-  const webIdURL = new URL(webId.uri)
-  // find storages in webId document
-  await store.fetcher.load(webId.uri)
-  const storages = store.each(webId, ns.space('storage'), null, webId.doc())
-  var podRoot: NamedNode | undefined
-  if (!storages?.length) {
-    // find storage recursively in webId URL
-    let path = webIdURL.pathname
-    while (path.length) {
-      path = path.substring(0, path.lastIndexOf('/'))
-      podRoot = store.sym(webIdURL.origin + path + '/')
-      const res = await store.fetcher.webOperation('HEAD', podRoot.uri)
-      if (res.headers.get('link')?.includes(ns.space('Storage').value)) break
-      if (!path) debug.warn(`Current user storage not found for\n${webId}`)
-    }
-  } else {
-    // give preference to storage in webId root
-    podRoot = storages.find((storage) => webIdURL.origin === new URL(storage.value).origin) as NamedNode
-    if (!podRoot) podRoot = storages[0] as NamedNode
+var pubKeyUrl = function pubKeyUrl(webId) {
+  var url;
+  try {
+    var root = (0, _otherHelpers.getRootIfPreferencesExist)(webId);
+    url = "".concat(root, "/profile/keys/publicKey.ttl");
+  } catch (err) {
+    debug.error(err);
   }
-
-  return podRoot as NamedNode
-} */
-
-var pubKeyUrl = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
-    var _store$any, _parentSettings;
-    var parentSettings;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          parentSettings = (_store$any = _solidLogic.store.any(webId, ns.space('preferencesFile'), null, webId.doc())) === null || _store$any === void 0 ? void 0 : _store$any.value;
-          parentSettings = (_parentSettings = parentSettings) === null || _parentSettings === void 0 ? void 0 : _parentSettings.split('/').slice(0, -2).join('/');
-          if (parentSettings) {
-            _context.next = 4;
-            break;
-          }
-          throw new Error("prefererencesFile is expected to exist in ".concat(webId.doc));
-        case 4:
-          return _context.abrupt("return", "".concat(parentSettings, "/profile/keys/publicKey.ttl"));
-        case 5:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function pubKeyUrl(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+  return url;
+};
 exports.pubKeyUrl = pubKeyUrl;
-function getExistingPublicKey(_x2, _x3) {
+var privKeyUrl = function privKeyUrl(webId) {
+  var url;
+  try {
+    var root = (0, _otherHelpers.getRootIfPreferencesExist)(webId);
+    url = "".concat(root, "/keys/privateKey.ttl");
+  } catch (err) {
+    debug.error(err);
+  }
+  return url;
+};
+exports.privKeyUrl = privKeyUrl;
+function getExistingPublicKey(_x, _x2) {
   return _getExistingPublicKey.apply(this, arguments);
 }
 function _getExistingPublicKey() {
-  _getExistingPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId, publicKeyUrl) {
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  _getExistingPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId, publicKeyUrl) {
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context3.next = 2;
+          _context.next = 2;
           return getKeyIfExists(webId, publicKeyUrl, 'publicKey');
         case 2:
-          return _context3.abrupt("return", _context3.sent);
+          return _context.abrupt("return", _context.sent);
         case 3:
         case "end":
-          return _context3.stop();
+          return _context.stop();
       }
-    }, _callee3);
+    }, _callee);
   }));
   return _getExistingPublicKey.apply(this, arguments);
 }
-var privKeyUrl = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
-    var _store$any2, _settings;
-    var settings;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          settings = (_store$any2 = _solidLogic.store.any(webId, ns.space('preferencesFile'), null, webId.doc())) === null || _store$any2 === void 0 ? void 0 : _store$any2.value;
-          settings = (_settings = settings) === null || _settings === void 0 ? void 0 : _settings.split('/').slice(0, -1).join('/');
-          if (settings) {
-            _context2.next = 4;
-            break;
-          }
-          throw new Error("prefererencesFile is expected to exist in ".concat(webId.doc));
-        case 4:
-          return _context2.abrupt("return", "".concat(settings, "/keys/privateKey.ttl"));
-        case 5:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function privKeyUrl(_x4) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-exports.privKeyUrl = privKeyUrl;
-function getExistingPrivateKey(_x5, _x6) {
+function getExistingPrivateKey(_x3, _x4) {
   return _getExistingPrivateKey.apply(this, arguments);
 }
 function _getExistingPrivateKey() {
-  _getExistingPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(webId, privateKeyUrl) {
-    return _regenerator["default"].wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+  _getExistingPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId, privateKeyUrl) {
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context4.next = 2;
+          _context2.next = 2;
           return getKeyIfExists(webId, privateKeyUrl, 'privateKey');
         case 2:
-          return _context4.abrupt("return", _context4.sent);
+          return _context2.abrupt("return", _context2.sent);
         case 3:
         case "end":
-          return _context4.stop();
+          return _context2.stop();
       }
-    }, _callee4);
+    }, _callee2);
   }));
   return _getExistingPrivateKey.apply(this, arguments);
 }
-function getKeyIfExists(_x7, _x8, _x9) {
+function getKeyIfExists(_x5, _x6, _x7) {
   return _getKeyIfExists.apply(this, arguments);
 }
 function _getKeyIfExists() {
-  _getKeyIfExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(webId, keyUrl, keyType) {
+  _getKeyIfExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId, keyUrl, keyType) {
     var key;
-    return _regenerator["default"].wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _context5.prev = 0;
-          _context5.next = 3;
+          _context3.prev = 0;
+          _context3.next = 3;
           return _solidLogic.store.fetcher.load(keyUrl);
         case 3:
           key = _solidLogic.store.any(webId, ns.solid(keyType)); // store.sym(CERT + keyType))
-          return _context5.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
+          return _context3.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
         case 7:
-          _context5.prev = 7;
-          _context5.t0 = _context5["catch"](0);
-          if (!(_context5.t0.response.status === 404)) {
-            _context5.next = 24;
-            break;
-          }
-          debug.log('createIfNotExists: doc does NOT exist, will create... ' + keyUrl);
-          _context5.prev = 11;
-          _context5.next = 14;
-          return _solidLogic.store.fetcher.webOperation('PUT', keyUrl, {
-            data: '',
-            contentType: 'text/turtle'
-          });
-        case 14:
-          _context5.next = 20;
-          break;
-        case 16:
-          _context5.prev = 16;
-          _context5.t1 = _context5["catch"](11);
-          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context5.t1);
-          throw _context5.t1;
-        case 20:
-          delete _solidLogic.store.fetcher.requested[keyUrl]; // delete cached 404 error
-          // debug.log('createIfNotExists doc created ok ' + doc)
-          return _context5.abrupt("return", undefined);
-        case 24:
-          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context5.t0);
-          throw _context5.t0;
-        case 26:
+          _context3.prev = 7;
+          _context3.t0 = _context3["catch"](0);
+          debug.error('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context3.t0);
+          return _context3.abrupt("return", undefined);
+        case 11:
         case "end":
-          return _context5.stop();
+          return _context3.stop();
       }
-    }, _callee5, null, [[0, 7], [11, 16]]);
+    }, _callee3, null, [[0, 7]]);
   }));
   return _getKeyIfExists.apply(this, arguments);
 }
@@ -14305,6 +14232,39 @@ exports.keyAclBody = keyAclBody;
 
 /***/ }),
 
+/***/ "./lib/utils/keyHelpers/otherHelpers.js":
+/*!**********************************************!*\
+  !*** ./lib/utils/keyHelpers/otherHelpers.js ***!
+  \**********************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js");
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.getRootIfPreferencesExist = void 0;
+var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
+var ns = _interopRequireWildcard(__webpack_require__(/*! ../../ns */ "./lib/ns.js"));
+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; }
+// Will rename this file later. We will probably be using solid-logic anyway
+// moved it out so I can mock
+
+var getRootIfPreferencesExist = function getRootIfPreferencesExist(webId) {
+  var _store$any, _root;
+  var root = (_store$any = _solidLogic.store.any(webId, ns.space('preferencesFile'), null, webId.doc())) === null || _store$any === void 0 ? void 0 : _store$any.value;
+  root = (_root = root) === null || _root === void 0 ? void 0 : _root.split('/').slice(0, -2).join('/');
+  if (!root) throw new Error("prefererencesFile is expected to exist in ".concat(webId));
+  return root;
+};
+exports.getRootIfPreferencesExist = getRootIfPreferencesExist;
+//# sourceMappingURL=otherHelpers.js.map
+
+/***/ }),
+
 /***/ "./lib/utils/label.js":
 /*!****************************!*\
   !*** ./lib/utils/label.js ***!
@@ -14433,8 +14393,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-05-29T17:22:09Z',
-  commit: '21f105c85cf152232421970c17d78f5c8cfa3d20',
+  buildTime: '2023-06-03T00:02:12Z',
+  commit: '4687e65a003328b622aaf8135ed2ea2afb1c068f',
   npmInfo: {
     'solid-ui': '2.4.28',
     npm: '8.19.4',