solid-ui 2.4.16-eb82ec38 → 2.4.18

package/lib/webpack-bundle.js

@@ -519,8 +519,12 @@ var AccessController = /*#__PURE__*/function () {
       } else {
         // Linked controls
         (0, _acl.makeACLGraphbyCombo)(newAClGraph, this.targetDoc, this.mainCombo.byCombo, this.targetACLDoc, true, true);
-      }
+      } // add authenticated fetcher
+
 
+      newAClGraph.fetcher = (0, _rdflib.fetcher)(newAClGraph, {
+        fetch: this.store.fetcher._fetch
+      });
       var updater = newAClGraph.updater || new _rdflib.UpdateManager(newAClGraph); // save ACL resource
 
       return new Promise(function (resolve, reject) {
@@ -655,11 +659,7 @@ var AccessGroups = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "rootElement", void 0);
     (0, _defineProperty2["default"])(this, "_store", void 0);
     this.defaults = options.defaults || false;
-    (0, _rdflib.fetcher)(store, {}); // The store will already have an updater at this point:
-    // store.updater = new UpdateManager(store)
-
-    this._store = store; // TODO hacky, find a better solution
-
+    this._store = store;
     this.aclMap = (0, _acl.readACL)(doc, aclDoc, store, this.defaults);
     this.byCombo = (0, _acl.ACLbyCombination)(this.aclMap);
     this.addAgentButton = new _addAgentButtons.AddAgentButtons(this);
@@ -12461,6 +12461,8 @@ var _wrapNativeSuper2 = _interopRequireDefault(__webpack_require__(/*! @babel/ru
 
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js"));
 
+var debug = _interopRequireWildcard(__webpack_require__(/*! ./debug */ "./lib/debug.js"));
+
 var _authn = __webpack_require__(/*! ./authn/authn */ "./lib/authn/authn.js");
 
 var _rdflib = __webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js");
@@ -12473,14 +12475,18 @@ var _utils = __webpack_require__(/*! ./utils */ "./lib/utils/index.js");
 
 var _pad = __webpack_require__(/*! ./pad */ "./lib/pad.js");
 
-var _debug = __webpack_require__(/*! ./debug */ "./lib/debug.js");
-
 var _logic = __webpack_require__(/*! ./logic */ "./lib/logic.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; }
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -12507,7 +12513,7 @@ var ParticipationTableElement = /*#__PURE__*/function (_HTMLTableElement) {
   return (0, _createClass2["default"])(ParticipationTableElement);
 }( /*#__PURE__*/(0, _wrapNativeSuper2["default"])(HTMLTableElement));
 
-var kb = _logic.solidLogicSingleton.store;
+var store = _logic.solidLogicSingleton.store;
 /**  Manage participation in this session
 *
 *  @param {Document} dom - the web page loaded into the browser
@@ -12522,7 +12528,7 @@ function renderPartipants(dom, table, unused1, subject, unused2, options) {
   table.setAttribute('style', 'margin: 0.8em;');
 
   var newRowForParticpation = function newRowForParticpation(parp) {
-    var person = kb.any(parp, ns.wf('participant'));
+    var person = store.any(parp, ns.wf('participant'));
     var tr;
 
     if (!person) {
@@ -12532,7 +12538,7 @@ function renderPartipants(dom, table, unused1, subject, unused2, options) {
       return tr;
     }
 
-    var bg = kb.anyValue(parp, ns.ui('backgroundColor')) || 'white';
+    var bg = store.anyValue(parp, ns.ui('backgroundColor')) || 'white';
     var block = dom.createElement('div');
     block.setAttribute('style', 'height: 1.5em; width: 1.5em; margin: 0.3em; border 0.01em solid #888; background-color: ' + bg);
     tr = (0, _widgets.personTR)(dom, null, person, options);
@@ -12545,9 +12551,9 @@ function renderPartipants(dom, table, unused1, subject, unused2, options) {
   };
 
   var syncTable = function syncTable() {
-    var parps = kb.each(subject, ns.wf('participation')).map(function (parp) {
-      (0, _debug.log)('in participants');
-      return [kb.anyValue(parp, ns.cal('dtstart')) || '9999-12-31', parp];
+    var parps = store.each(subject, ns.wf('participation')).map(function (parp) {
+      (0, debug.log)('in participants');
+      return [store.anyValue(parp, ns.cal('dtstart')) || '9999-12-31', parp];
     });
     parps.sort(); // List in order of joining
 
@@ -12575,36 +12581,57 @@ function renderPartipants(dom, table, unused1, subject, unused2, options) {
 function participationObject(subject, padDoc, me) {
   return new Promise(function (resolve, reject) {
     if (!me) {
-      throw new Error('Not user id');
+      throw new Error('No user id');
     }
 
-    var parps = kb.each(subject, ns.wf('participation')).filter(function (pn) {
-      return kb.holds(pn, ns.wf('participant'), me);
+    var parps = store.each(subject, ns.wf('participation')).filter(function (pn) {
+      return store.holds(pn, ns.wf('participant'), me);
     });
 
     if (parps.length > 1) {
-      throw new Error('Multiple records of your participation');
+      // This can happen. https://github.com/solid/chat-pane/issues/71
+      var candidates = [];
+
+      var _iterator = _createForOfIteratorHelper(parps),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var participation = _step.value;
+          var date = store.anyValue(participation, ns.cal('dtstart'));
+
+          if (date) {
+            candidates.push([date, participation]);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      candidates.sort(); // Pick the earliest
+      // @@ Possibly, for extra credit, delete the others, if we have write access
+
+      debug.warn('Multiple particpation objects, picking earliest, in ' + padDoc);
+      resolve(candidates[0][1]); // throw new Error('Multiple records of your participation')
     }
 
     if (parps.length) {
       // If I am not already recorded
       resolve(parps[0]); // returns the particpation object
     } else {
-      var participation = (0, _widgets.newThing)(padDoc);
-      var ins = [(0, _rdflib.st)(subject, ns.wf('participation'), participation, padDoc), (0, _rdflib.st)(participation, ns.wf('participant'), me, padDoc), (0, _rdflib.st)(participation, ns.cal('dtstart'), new Date(), padDoc), (0, _rdflib.st)(participation, ns.ui('backgroundColor'), (0, _pad.lightColorHash)(me), padDoc)];
-
-      if (!kb.updater) {
-        throw new Error('kb has no updater');
-      }
+      var _participation2 = (0, _widgets.newThing)(padDoc);
 
-      kb.updater.update([], ins, function (uri, ok, errorMessage) {
+      var ins = [(0, _rdflib.st)(subject, ns.wf('participation'), _participation2, padDoc), (0, _rdflib.st)(_participation2, ns.wf('participant'), me, padDoc), (0, _rdflib.st)(_participation2, ns.cal('dtstart'), new Date(), padDoc), (0, _rdflib.st)(_participation2, ns.ui('backgroundColor'), (0, _pad.lightColorHash)(me), padDoc)];
+      store.updater.update([], ins, function (uri, ok, errorMessage) {
         if (!ok) {
           reject(new Error('Error recording your partipation: ' + errorMessage));
         } else {
-          resolve(participation);
+          resolve(_participation2);
         }
       });
-      resolve(participation);
+      resolve(_participation2);
     }
   });
 }
@@ -12621,8 +12648,8 @@ function recordParticipation(subject, padDoc, refreshable) {
   var me = (0, _authn.currentUser)();
   if (!me) return; // Not logged in
 
-  var parps = kb.each(subject, ns.wf('participation')).filter(function (pn) {
-    return kb.holds(pn, ns.wf('participant'), me);
+  var parps = store.each(subject, ns.wf('participation')).filter(function (pn) {
+    return store.holds(pn, ns.wf('participant'), me);
   });
 
   if (parps.length > 1) {
@@ -12633,14 +12660,14 @@ function recordParticipation(subject, padDoc, refreshable) {
     // If I am not already recorded
     return parps[0]; // returns the particpation object
   } else {
-    var participation = (0, _widgets.newThing)(padDoc);
-    var ins = [(0, _rdflib.st)(subject, ns.wf('participation'), participation, padDoc), (0, _rdflib.st)(participation, ns.wf('participant'), me, padDoc), (0, _rdflib.st)(participation, ns.cal('dtstart'), new Date(), padDoc), (0, _rdflib.st)(participation, ns.ui('backgroundColor'), (0, _pad.lightColorHash)(me), padDoc)];
-
-    if (!kb.updater) {
-      throw new Error('kb has no updater');
+    if (!store.updater.editable(padDoc)) {
+      debug.log('Not recording participation, as no write acesss as ' + me + ' to ' + padDoc);
+      return null;
     }
 
-    kb.updater.update([], ins, function (uri, ok, errorMessage) {
+    var participation = (0, _widgets.newThing)(padDoc);
+    var ins = [(0, _rdflib.st)(subject, ns.wf('participation'), participation, padDoc), (0, _rdflib.st)(participation, ns.wf('participant'), me, padDoc), (0, _rdflib.st)(participation, ns.cal('dtstart'), new Date(), padDoc), (0, _rdflib.st)(participation, ns.ui('backgroundColor'), (0, _pad.lightColorHash)(me), padDoc)];
+    store.updater.update([], ins, function (uri, ok, errorMessage) {
       if (!ok) {
         throw new Error('Error recording your partipation: ' + errorMessage);
       }
@@ -12670,8 +12697,10 @@ function manageParticipation(dom, container, padDoc, subject, me, options) {
   container.appendChild(table);
   renderPartipants(dom, table, padDoc, subject, me, options);
 
+  var _participation;
+
   try {
-    recordParticipation(subject, padDoc, table);
+    _participation = recordParticipation(subject, padDoc, table);
   } catch (e) {
     container.appendChild((0, _widgets.errorMessageBlock)(dom, 'Error recording your partipation: ' + e)); // Clean up?
   }
@@ -16141,25 +16170,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = {
-  buildTime: '2022-01-31T14:56:45Z',
-  commit: 'eb82ec38b28b2e2feb872492149f48b6507ebf42',
+  buildTime: '2022-02-23T14:20:11Z',
+  commit: '707601b18fc26917752ae0150bdc55058a34312e',
   npmInfo: {
-    'solid-ui': '2.4.16',
-    npm: '6.14.15',
-    ares: '1.18.1',
+    'solid-ui': '2.4.18',
+    npm: '6.14.13',
+    ares: '1.17.1',
     brotli: '1.0.9',
     cldr: '39.0',
     icu: '69.1',
-    llhttp: '2.1.4',
+    llhttp: '2.1.3',
     modules: '83',
     napi: '8',
     nghttp2: '1.42.0',
-    node: '14.18.3',
-    openssl: '1.1.1l',
+    node: '14.17.3',
+    openssl: '1.1.1k',
     tz: '2021a',
     unicode: '13.0',
-    uv: '1.42.0',
-    v8: '8.4.371.23-node.85',
+    uv: '1.41.0',
+    v8: '8.4.371.23-node.67',
     zlib: '1.2.11'
   }
 };