solid-ui 2.4.27-e1d1a020 → 2.4.27-efb14913

package/dist/solid-ui.js

@@ -3027,10 +3027,11 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.DateFolder = void 0;
+exports.emptyLeaf = emptyLeaf;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js"));
-var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ "./node_modules/@babel/runtime/helpers/asyncToGenerator.js"));
 var _classCallCheck2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/classCallCheck */ "./node_modules/@babel/runtime/helpers/classCallCheck.js"));
 var _createClass2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/createClass */ "./node_modules/@babel/runtime/helpers/createClass.js"));
+var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ "./node_modules/@babel/runtime/helpers/asyncToGenerator.js"));
 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"));
@@ -3043,9 +3044,29 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  *
  */
 // pull in first avoid cross-refs
+function emptyLeaf(_x) {
+  return _emptyLeaf.apply(this, arguments);
+}
 /**
  * Track back through the YYYY/MM/DD tree to find the previous/next day
  */
+function _emptyLeaf() {
+  _emptyLeaf = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(leafDocument) {
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.next = 2;
+          return _solidLogic.store.fetcher.load(leafDocument);
+        case 2:
+          return _context5.abrupt("return", !(_solidLogic.store.statementsMatching(null, ns.dct('created'), null, leafDocument).length > 0));
+        case 3:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return _emptyLeaf.apply(this, arguments);
+}
 var DateFolder = /*#__PURE__*/function () {
   function DateFolder(rootThing, leafFileName, membershipProperty) {
     (0, _classCallCheck2["default"])(this, DateFolder);
@@ -3084,61 +3105,22 @@ var DateFolder = /*#__PURE__*/function () {
   }, {
     key: "loadPrevious",
     value: function () {
-      var _loadPrevious = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(date, backwards) {
-        var thisDateFolder, previousPeriod, _previousPeriod, folder, found, doc;
-        return _regenerator["default"].wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _loadPrevious = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(date, backwards) {
+        var previousPeriod, _previousPeriod, folder, found, leafDocument, nextDate;
+        return _regenerator["default"].wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _previousPeriod = function _previousPeriod3() {
-                _previousPeriod = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(file, level) {
-                  var younger, suitable, lastNonEmpty, _lastNonEmpty, parent, siblings, _folder, uncle, cousins, result;
-                  return _regenerator["default"].wrap(function _callee2$(_context2) {
-                    while (1) switch (_context2.prev = _context2.next) {
+                _previousPeriod = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(file, level) {
+                  var younger, suitable, lastOrFirst, parent, siblings, _folder, uncle, cousins, result;
+                  return _regenerator["default"].wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
                       case 0:
-                        _lastNonEmpty = function _lastNonEmpty3() {
-                          _lastNonEmpty = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(siblings) {
-                            var _folder2, leafDocument;
-                            return _regenerator["default"].wrap(function _callee$(_context) {
-                              while (1) switch (_context.prev = _context.next) {
-                                case 0:
-                                  siblings = siblings.filter(suitable);
-                                  siblings.sort(); // chronological order
-                                  if (!backwards) siblings.reverse();
-                                  if (!(level !== 3)) {
-                                    _context.next = 5;
-                                    break;
-                                  }
-                                  return _context.abrupt("return", siblings.pop());
-                                case 5:
-                                  if (!siblings.length) {
-                                    _context.next = 14;
-                                    break;
-                                  }
-                                  _folder2 = siblings.pop();
-                                  leafDocument = _solidLogic.store.sym(_folder2.uri + thisDateFolder.leafFileName);
-                                  _context.next = 10;
-                                  return _solidLogic.store.fetcher.load(leafDocument);
-                                case 10:
-                                  if (!(_solidLogic.store.statementsMatching(null, ns.dct('created'), null, leafDocument).length > 0)) {
-                                    _context.next = 12;
-                                    break;
-                                  }
-                                  return _context.abrupt("return", _folder2);
-                                case 12:
-                                  _context.next = 5;
-                                  break;
-                                case 14:
-                                  return _context.abrupt("return", null);
-                                case 15:
-                                case "end":
-                                  return _context.stop();
-                              }
-                            }, _callee);
-                          }));
-                          return _lastNonEmpty.apply(this, arguments);
-                        };
-                        lastNonEmpty = function _lastNonEmpty2(_x5) {
-                          return _lastNonEmpty.apply(this, arguments);
+                        lastOrFirst = function _lastOrFirst(siblings) {
+                          siblings = siblings.filter(suitable);
+                          siblings.sort(); // chronological order
+                          if (!backwards) siblings.reverse();
+                          return siblings.pop(); // date folder
                         };
                         suitable = function _suitable(x) {
                           var tail = x.uri.slice(0, -1).split('/').slice(-1)[0];
@@ -3151,97 +3133,116 @@ var DateFolder = /*#__PURE__*/function () {
                         };
                         // debug.log('  previousPeriod level' + level + ' file ' + file)
                         parent = file.dir();
-                        _context2.prev = 5;
-                        _context2.next = 8;
+                        _context.prev = 4;
+                        _context.next = 7;
                         return _solidLogic.store.fetcher.load(parent);
-                      case 8:
+                      case 7:
                         siblings = _solidLogic.store.each(parent, ns.ldp('contains'));
                         siblings = siblings.filter(younger);
-                        _context2.next = 12;
-                        return lastNonEmpty(siblings);
-                      case 12:
-                        _folder = _context2.sent;
+                        _folder = lastOrFirst(siblings);
                         if (!_folder) {
-                          _context2.next = 15;
+                          _context.next = 12;
                           break;
                         }
-                        return _context2.abrupt("return", _folder);
-                      case 15:
-                        _context2.next = 25;
+                        return _context.abrupt("return", _folder);
+                      case 12:
+                        debug.log(' parent no suitable offspring ' + parent);
+                        _context.next = 23;
                         break;
-                      case 17:
-                        _context2.prev = 17;
-                        _context2.t0 = _context2["catch"](5);
-                        if (!(_context2.t0.response && _context2.t0.response.status && _context2.t0.response.status === 404)) {
-                          _context2.next = 23;
+                      case 15:
+                        _context.prev = 15;
+                        _context.t0 = _context["catch"](4);
+                        if (!(_context.t0.response && _context.t0.response.status && _context.t0.response.status === 404)) {
+                          _context.next = 21;
                           break;
                         }
                         debug.log('Error 404 for chat parent file ' + parent);
-                        _context2.next = 25;
+                        _context.next = 23;
                         break;
-                      case 23:
+                      case 21:
                         debug.log('*** Error NON 404 for chat parent file ' + parent);
                         // statusTR.appendChild(widgets.errorMessageBlock(dom, err, 'pink'))
-                        throw new Error("*** ".concat(_context2.t0.message, " for chat folder ").concat(parent));
-                      case 25:
+                        throw new Error("*** ".concat(_context.t0.message, " for chat folder ").concat(parent));
+                      case 23:
                         if (!(level === 0)) {
-                          _context2.next = 27;
+                          _context.next = 26;
                           break;
                         }
-                        return _context2.abrupt("return", null);
-                      case 27:
-                        _context2.next = 29;
+                        debug.log('loadPrevious:  returning as level is zero');
+                        return _context.abrupt("return", null);
+                      case 26:
+                        _context.next = 28;
                         return previousPeriod(parent, level - 1);
-                      case 29:
-                        uncle = _context2.sent;
+                      case 28:
+                        uncle = _context.sent;
                         if (uncle) {
-                          _context2.next = 32;
+                          _context.next = 32;
                           break;
                         }
-                        return _context2.abrupt("return", null);
+                        debug.log('   previousPeriod: nothing left before. ', parent);
+                        return _context.abrupt("return", null);
                       case 32:
-                        _context2.next = 34;
+                        _context.next = 34;
                         return _solidLogic.store.fetcher.load(uncle);
                       case 34:
                         cousins = _solidLogic.store.each(uncle, ns.ldp('contains'));
-                        _context2.next = 37;
-                        return lastNonEmpty(cousins);
-                      case 37:
-                        result = _context2.sent;
-                        return _context2.abrupt("return", result);
+                        result = lastOrFirst(cousins);
+                        debug.log('   previousPeriod: returning cousins at level ' + level, cousins);
+                        debug.log('   previousPeriod: returning result at level ' + level, result);
+                        return _context.abrupt("return", result);
                       case 39:
                       case "end":
-                        return _context2.stop();
+                        return _context.stop();
                     }
-                  }, _callee2, null, [[5, 17]]);
+                  }, _callee, null, [[4, 15]]);
                 }));
                 return _previousPeriod.apply(this, arguments);
               };
-              previousPeriod = function _previousPeriod2(_x3, _x4) {
+              previousPeriod = function _previousPeriod2(_x4, _x5) {
                 return _previousPeriod.apply(this, arguments);
               };
-              thisDateFolder = this;
               // previousPeriod
               folder = this.leafDocumentFromDate(date).dir();
-              _context3.next = 6;
+            case 3:
+              if (false) {}
+              _context2.next = 6;
               return previousPeriod(folder, 3);
             case 6:
-              found = _context3.sent;
+              found = _context2.sent;
               if (!found) {
-                _context3.next = 10;
+                _context2.next = 22;
                 break;
               }
-              doc = _solidLogic.store.sym(found.uri + this.leafFileName);
-              return _context3.abrupt("return", this.dateFromLeafDocument(doc));
-            case 10:
-              return _context3.abrupt("return", null);
-            case 11:
+              leafDocument = _solidLogic.store.sym(found.uri + this.leafFileName);
+              nextDate = this.dateFromLeafDocument(leafDocument);
+              _context2.next = 12;
+              return emptyLeaf(leafDocument);
+            case 12:
+              if (_context2.sent) {
+                _context2.next = 16;
+                break;
+              }
+              return _context2.abrupt("return", nextDate);
+            case 16:
+              debug.log('  loadPrevious: skipping empty ' + leafDocument);
+              date = nextDate;
+              folder = this.leafDocumentFromDate(date).dir();
+              debug.log('    loadPrevious: moved back to ' + folder);
+            case 20:
+              _context2.next = 23;
+              break;
+            case 22:
+              return _context2.abrupt("return", null);
+            case 23:
+              _context2.next = 3;
+              break;
+            case 25:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
-      function loadPrevious(_x, _x2) {
+      function loadPrevious(_x2, _x3) {
         return _loadPrevious.apply(this, arguments);
       }
       return loadPrevious;
@@ -3249,16 +3250,16 @@ var DateFolder = /*#__PURE__*/function () {
   }, {
     key: "firstLeaf",
     value: function () {
-      var _firstLeaf = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(backwards) {
+      var _firstLeaf = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(backwards) {
         var folderStore, folderFetcher, earliestSubfolder, _earliestSubfolder, y, month, d, leafDocument, leafObjects, msg, sortMe;
-        return _regenerator["default"].wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+        return _regenerator["default"].wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _earliestSubfolder = function _earliestSubfolder3() {
-                _earliestSubfolder = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(parent) {
+                _earliestSubfolder = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(parent) {
                   var suitable, kids;
-                  return _regenerator["default"].wrap(function _callee4$(_context4) {
-                    while (1) switch (_context4.prev = _context4.next) {
+                  return _regenerator["default"].wrap(function _callee3$(_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
                       case 0:
                         suitable = function _suitable2(x) {
                           var tail = x.uri.slice(0, -1).split('/').slice(-1)[0];
@@ -3268,7 +3269,7 @@ var DateFolder = /*#__PURE__*/function () {
                         debug.log('            parent ' + parent);
                         delete folderFetcher.requested[parent.uri];
                         // try {
-                        _context4.next = 5;
+                        _context3.next = 5;
                         return folderFetcher.load(parent, {
                           force: true
                         });
@@ -3279,19 +3280,19 @@ var DateFolder = /*#__PURE__*/function () {
                         kids = folderStore.each(parent, ns.ldp('contains'));
                         kids = kids.filter(suitable);
                         if (!(kids.length === 0)) {
-                          _context4.next = 9;
+                          _context3.next = 9;
                           break;
                         }
                         throw new Error(' @@@  No children to         parent2 ' + parent);
                       case 9:
                         kids.sort();
                         if (backwards) kids.reverse();
-                        return _context4.abrupt("return", kids[0]);
+                        return _context3.abrupt("return", kids[0]);
                       case 12:
                       case "end":
-                        return _context4.stop();
+                        return _context3.stop();
                     }
-                  }, _callee4);
+                  }, _callee3);
                 }));
                 return _earliestSubfolder.apply(this, arguments);
               };
@@ -3301,25 +3302,25 @@ var DateFolder = /*#__PURE__*/function () {
               // backwards -> last leafObject
               folderStore = $rdf.graph();
               folderFetcher = new $rdf.Fetcher(folderStore);
-              _context5.next = 6;
+              _context4.next = 6;
               return earliestSubfolder(this.root.dir());
             case 6:
-              y = _context5.sent;
-              _context5.next = 9;
+              y = _context4.sent;
+              _context4.next = 9;
               return earliestSubfolder(y);
             case 9:
-              month = _context5.sent;
-              _context5.next = 12;
+              month = _context4.sent;
+              _context4.next = 12;
               return earliestSubfolder(month);
             case 12:
-              d = _context5.sent;
+              d = _context4.sent;
               leafDocument = $rdf.sym(d.uri + 'chat.ttl');
-              _context5.next = 16;
+              _context4.next = 16;
               return folderFetcher.load(leafDocument);
             case 16:
               leafObjects = folderStore.each(this.root, this.membershipProperty, null, leafDocument);
               if (!(leafObjects.length === 0)) {
-                _context5.next = 21;
+                _context4.next = 21;
                 break;
               }
               msg = '  INCONSISTENCY -- no chat leafObject in file ' + leafDocument;
@@ -3332,12 +3333,12 @@ var DateFolder = /*#__PURE__*/function () {
               sortMe.sort();
               if (backwards) sortMe.reverse();
               debug.log((backwards ? 'Latest' : 'Earliest') + ' leafObject is ' + sortMe[0][1]);
-              return _context5.abrupt("return", sortMe[0][1]);
+              return _context4.abrupt("return", sortMe[0][1]);
             case 26:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
       function firstLeaf(_x6) {
         return _firstLeaf.apply(this, arguments);
@@ -4091,26 +4092,27 @@ function _infiniteMessageArea() {
                     }
                     return _context4.abrupt("return", true);
                   case 4:
-                    _context4.next = 6;
+                    debug.log(' insertPreviousMessages:  loadPrevious given date ' + date);
+                    _context4.next = 7;
                     return dateFolder.loadPrevious(date, backwards);
-                  case 6:
+                  case 7:
                     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 = 11;
+                      _context4.next = 13;
                       break;
                     }
-                    _context4.next = 11;
+                    _context4.next = 13;
                     return appendCurrentMessages();
-                  case 11:
+                  case 13:
                     if (date) {
-                      _context4.next = 13;
+                      _context4.next = 15;
                       break;
                     }
                     return _context4.abrupt("return", true);
-                  case 13:
+                  case 15:
                     // done
                     live = false;
                     if (!backwards) {
@@ -4118,9 +4120,9 @@ function _infiniteMessageArea() {
                       doc = dateFolder.leafDocumentFromDate(date);
                       live = doc.sameTerm(todayDoc); // Is this todays?
                     }
-                    _context4.next = 17;
+                    _context4.next = 19;
                     return createMessageTable(date, live);
-                  case 17:
+                  case 19:
                     newMessageTable = _context4.sent;
                     extremity.messageTable = newMessageTable; // move pointer to earliest
                     if (backwards ? newestFirst : !newestFirst) {
@@ -4131,7 +4133,7 @@ function _infiniteMessageArea() {
                       div.insertBefore(newMessageTable, div.firstChild);
                     }
                     return _context4.abrupt("return", live);
-                  case 21:
+                  case 23:
                   case "end":
                     return _context4.stop();
                 }
@@ -13602,8 +13604,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-04-11T07:16:22Z',
-  commit: 'e1d1a0208ca2a794beee1d50b841c2923d5efea1',
+  buildTime: '2023-04-14T17:55:24Z',
+  commit: 'efb14913e8cdcab31819cda6bc3dcab0f476bfec',
   npmInfo: {
     'solid-ui': '2.4.27',
     npm: '8.19.4',