solid-ui 2.4.32-8d90d955 → 2.4.32-9d930db7

package/lib/utils/keyHelpers/accessData.js

@@ -14,118 +14,174 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var debug = _interopRequireWildcard(require("../../debug"));
 var _solidLogic = require("solid-logic");
 var ns = _interopRequireWildcard(require("../../ns"));
-var _otherHelpers = require("./otherHelpers");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-var pubKeyUrl = exports.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);
+/* 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
   }
-  return url;
-};
-var privKeyUrl = exports.privKeyUrl = function privKeyUrl(webId) {
-  var url;
-  try {
-    var root = (0, _otherHelpers.getRootIfPreferencesExist)(webId);
-    url = "".concat(root, "/settings/keys/privateKey.ttl");
-  } catch (err) {
-    debug.error(err);
-  }
-  return url;
-};
-function getExistingPublicKey(_x, _x2) {
+
+  return podRoot as NamedNode
+} */
+
+var pubKeyUrl = exports.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);
+  };
+}();
+function getExistingPublicKey(_x2, _x3) {
   return _getExistingPublicKey.apply(this, arguments);
 }
 function _getExistingPublicKey() {
-  _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) {
+  _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) {
         case 0:
-          _context.next = 2;
+          _context3.next = 2;
           return getKeyIfExists(webId, publicKeyUrl, 'publicKey');
         case 2:
-          return _context.abrupt("return", _context.sent);
+          return _context3.abrupt("return", _context3.sent);
         case 3:
         case "end":
-          return _context.stop();
+          return _context3.stop();
       }
-    }, _callee);
+    }, _callee3);
   }));
   return _getExistingPublicKey.apply(this, arguments);
 }
-function getExistingPrivateKey(_x3, _x4) {
+var privKeyUrl = exports.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);
+  };
+}();
+function getExistingPrivateKey(_x5, _x6) {
   return _getExistingPrivateKey.apply(this, arguments);
 }
 function _getExistingPrivateKey() {
-  _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) {
+  _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) {
         case 0:
-          _context2.next = 2;
+          _context4.next = 2;
           return getKeyIfExists(webId, privateKeyUrl, 'privateKey');
         case 2:
-          return _context2.abrupt("return", _context2.sent);
+          return _context4.abrupt("return", _context4.sent);
         case 3:
         case "end":
-          return _context2.stop();
+          return _context4.stop();
       }
-    }, _callee2);
+    }, _callee4);
   }));
   return _getExistingPrivateKey.apply(this, arguments);
 }
-function getKeyIfExists(_x5, _x6, _x7) {
+function getKeyIfExists(_x7, _x8, _x9) {
   return _getKeyIfExists.apply(this, arguments);
 }
 function _getKeyIfExists() {
-  _getKeyIfExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId, keyUrl, keyType) {
+  _getKeyIfExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(webId, keyUrl, keyType) {
     var key;
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          _context3.prev = 0;
-          _context3.next = 3;
+          _context5.prev = 0;
+          _context5.next = 3;
           return _solidLogic.store.fetcher.load(keyUrl);
         case 3:
           key = _solidLogic.store.any(webId, ns.solid(keyType)); // store.sym(CERT + keyType))
-          return _context3.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
+          return _context5.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
         case 7:
-          _context3.prev = 7;
-          _context3.t0 = _context3["catch"](0);
-          if (!(_context3.t0.response.status === 404)) {
-            _context3.next = 24;
+          _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);
-          _context3.prev = 11;
-          _context3.next = 14;
+          _context5.prev = 11;
+          _context5.next = 14;
           return _solidLogic.store.fetcher.webOperation('PUT', keyUrl, {
             data: '',
             contentType: 'text/turtle'
           });
         case 14:
-          _context3.next = 20;
+          _context5.next = 20;
           break;
         case 16:
-          _context3.prev = 16;
-          _context3.t1 = _context3["catch"](11);
-          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context3.t1);
-          throw _context3.t1;
+          _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 _context3.abrupt("return", undefined);
+          return _context5.abrupt("return", undefined);
         case 24:
-          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context3.t0);
-          throw _context3.t0;
+          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context5.t0);
+          throw _context5.t0;
         case 26:
         case "end":
-          return _context3.stop();
+          return _context5.stop();
       }
-    }, _callee3, null, [[0, 7], [11, 16]]);
+    }, _callee5, null, [[0, 7], [11, 16]]);
   }));
   return _getKeyIfExists.apply(this, arguments);
 }

package/lib/utils/keyHelpers/accessData.js.map

@@ -1 +1 @@
-{"version":3,"file":"accessData.js","names":["debug","_interopRequireWildcard","require","_solidLogic","ns","_otherHelpers","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","pubKeyUrl","exports","webId","url","root","getRootIfPreferencesExist","concat","err","error","privKeyUrl","getExistingPublicKey","_x","_x2","_getExistingPublicKey","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","publicKeyUrl","wrap","_callee$","_context","prev","next","getKeyIfExists","abrupt","sent","stop","getExistingPrivateKey","_x3","_x4","_getExistingPrivateKey","_callee2","privateKeyUrl","_callee2$","_context2","_x5","_x6","_x7","_getKeyIfExists","_callee3","keyUrl","keyType","key","_callee3$","_context3","store","fetcher","load","any","solid","value","t0","response","status","log","webOperation","data","contentType","t1","requested","undefined"],"sources":["../../../src/utils/keyHelpers/accessData.ts"],"sourcesContent":["import * as debug from '../../debug'\nimport { store } from 'solid-logic'\nimport * as ns from '../../ns'\nimport { NamedNode } from 'rdflib'\nimport { getRootIfPreferencesExist } from './otherHelpers'\n\nexport const pubKeyUrl = (webId: NamedNode) => {\n  let url\n  try {\n    const root = getRootIfPreferencesExist(webId)\n    url = `${root}/profile/keys/publicKey.ttl`\n  } catch (err) {\n    debug.error(err)\n  }\n  return url\n}\n\nexport const privKeyUrl = (webId: NamedNode) => {\n  let url\n  try {\n    const root = getRootIfPreferencesExist(webId)\n    url = `${root}/settings/keys/privateKey.ttl`\n  } catch (err) {\n    debug.error(err)\n  }\n  return url\n}\n\nexport async function getExistingPublicKey (webId: NamedNode, publicKeyUrl: string) {\n  // find publickey\n  return await getKeyIfExists(webId, publicKeyUrl, 'publicKey')\n}\n\nexport async function getExistingPrivateKey (webId: NamedNode, privateKeyUrl: string) {\n  // find privateKey\n  return await getKeyIfExists(webId, privateKeyUrl, 'privateKey')\n}\n\ntype KeyType = 'publicKey' | 'privateKey'\n\nexport async function getKeyIfExists (webId: NamedNode, keyUrl: string, keyType: KeyType) {\n  try {\n    await store.fetcher.load(keyUrl)\n    const key = store.any(webId, ns.solid(keyType)) // store.sym(CERT + keyType))\n    return key?.value // as NamedNode\n  } catch (err) {\n    if (err.response.status === 404) {\n      debug.log(\n        'createIfNotExists: doc does NOT exist, will create... ' + keyUrl\n      )\n      try {\n        await store.fetcher.webOperation('PUT', keyUrl, {\n          data: '',\n          contentType: 'text/turtle'\n        })\n      } catch (err) {\n        debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + err)\n        throw err\n      }\n      delete store.fetcher.requested[keyUrl] // delete cached 404 error\n      // debug.log('createIfNotExists doc created ok ' + doc)\n      return undefined // response\n    } else {\n      debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + err)\n      throw err\n    }\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"accessData.js","names":["debug","_interopRequireWildcard","require","_solidLogic","ns","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","pubKeyUrl","exports","_ref","_asyncToGenerator2","_regenerator","mark","_callee","webId","_store$any","_parentSettings","parentSettings","wrap","_callee$","_context","prev","next","store","any","space","doc","value","split","slice","join","Error","concat","abrupt","stop","_x","apply","arguments","getExistingPublicKey","_x2","_x3","_getExistingPublicKey","_callee3","publicKeyUrl","_callee3$","_context3","getKeyIfExists","sent","privKeyUrl","_ref2","_callee2","_store$any2","_settings","settings","_callee2$","_context2","_x4","getExistingPrivateKey","_x5","_x6","_getExistingPrivateKey","_callee4","privateKeyUrl","_callee4$","_context4","_x7","_x8","_x9","_getKeyIfExists","_callee5","keyUrl","keyType","key","_callee5$","_context5","fetcher","load","solid","t0","response","status","log","webOperation","data","contentType","t1","requested","undefined"],"sources":["../../../src/utils/keyHelpers/accessData.ts"],"sourcesContent":["import * as debug from '../../debug'\nimport { store } from 'solid-logic'\nimport * as ns from '../../ns'\nimport { NamedNode } from 'rdflib'\n\n/* export const getPodRoot = async (webId: NamedNode) => {\n  const webIdURL = new URL(webId.uri)\n  // find storages in webId document\n  await store.fetcher.load(webId.uri)\n  const storages = store.each(webId, ns.space('storage'), null, webId.doc())\n  var podRoot: NamedNode | undefined\n  if (!storages?.length) {\n    // find storage recursively in webId URL\n    let path = webIdURL.pathname\n    while (path.length) {\n      path = path.substring(0, path.lastIndexOf('/'))\n      podRoot = store.sym(webIdURL.origin + path + '/')\n      const res = await store.fetcher.webOperation('HEAD', podRoot.uri)\n      if (res.headers.get('link')?.includes(ns.space('Storage').value)) break\n      if (!path) debug.warn(`Current user storage not found for\\n${webId}`)\n    }\n  } else {\n    // give preference to storage in webId root\n    podRoot = storages.find((storage) => webIdURL.origin === new URL(storage.value).origin) as NamedNode\n    if (!podRoot) podRoot = storages[0] as NamedNode\n  }\n\n  return podRoot as NamedNode\n} */\n\nexport const pubKeyUrl = async (webId: NamedNode) => {\n  let parentSettings = store.any(webId, ns.space('preferencesFile'), null, webId.doc())?.value\n  parentSettings = parentSettings?.split('/').slice(0, -2).join('/')\n  if (!parentSettings) throw new Error(`prefererencesFile is expected to exist in ${webId.doc}`)\n  return `${parentSettings}/profile/keys/publicKey.ttl`\n  /* try {\n    return (await getPodRoot(webId)).value + 'profile/keys/publicKey.ttl'\n  } catch (err) { throw new Error(err) } */\n}\n\nexport async function getExistingPublicKey (webId: NamedNode, publicKeyUrl: string) {\n  // find publickey\n  return await getKeyIfExists(webId, publicKeyUrl, 'publicKey')\n}\n\nexport const privKeyUrl = async (webId: NamedNode) => {\n  let settings = store.any(webId, ns.space('preferencesFile'), null, webId.doc())?.value\n  settings = settings?.split('/').slice(0, -1).join('/')\n  if (!settings) throw new Error(`prefererencesFile is expected to exist in ${webId.doc}`)\n  return `${settings}/keys/privateKey.ttl`\n  /* try {\n    const podRoot = await getPodRoot(webId)\n    if (!settings?.startsWith(podRoot.value)) throw new Error(`/settings/ is expected to be in ${podRoot.value}`)\n    return `${settings}/keys/privateKey.ttl`\n  } catch (err) { throw new Error(err) } */\n}\n\nexport async function getExistingPrivateKey (webId: NamedNode, privateKeyUrl: string) {\n  // find privateKey\n  return await getKeyIfExists(webId, privateKeyUrl, 'privateKey')\n}\n\ntype KeyType = 'publicKey' | 'privateKey'\n\nexport async function getKeyIfExists (webId: NamedNode, keyUrl: string, keyType: KeyType) {\n  try {\n    await store.fetcher.load(keyUrl)\n    const key = store.any(webId, ns.solid(keyType)) // store.sym(CERT + keyType))\n    return key?.value // as NamedNode\n  } catch (err) {\n    if (err.response.status === 404) {\n      debug.log(\n        'createIfNotExists: doc does NOT exist, will create... ' + keyUrl\n      )\n      try {\n        await store.fetcher.webOperation('PUT', keyUrl, {\n          data: '',\n          contentType: 'text/turtle'\n        })\n      } catch (err) {\n        debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + err)\n        throw err\n      }\n      delete store.fetcher.requested[keyUrl] // delete cached 404 error\n      // debug.log('createIfNotExists doc created ok ' + doc)\n      return undefined // response\n    } else {\n      debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + err)\n      throw err\n    }\n  }\n}\n"],"mappings":"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"}

package/lib/utils/keyHelpers/acl.js

@@ -36,38 +36,38 @@ function _setAcl() {
           return _solidLogic.store.fetcher.load(keyDoc);
         case 2:
           // FIXME: check the Why value on this quad:
-          // debug.log(store.statementsMatching(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl')))
+          debug.log(_solidLogic.store.statementsMatching(_solidLogic.store.sym(keyDoc), _solidLogic.store.sym('http://www.iana.org/assignments/link-relations/acl')));
           keyAclDoc = _solidLogic.store.any(_solidLogic.store.sym(keyDoc), _solidLogic.store.sym('http://www.iana.org/assignments/link-relations/acl'));
           if (keyAclDoc) {
-            _context.next = 5;
+            _context.next = 6;
             break;
           }
           throw new Error('Key ACL doc not found!');
-        case 5:
-          _context.prev = 5;
-          _context.next = 8;
+        case 6:
+          _context.prev = 6;
+          _context.next = 9;
           return _solidLogic.store.fetcher.webOperation('PUT', keyAclDoc.value, {
             data: aclBody,
             contentType: 'text/turtle'
           });
-        case 8:
-          _context.next = 15;
+        case 9:
+          _context.next = 16;
           break;
-        case 10:
-          _context.prev = 10;
-          _context.t0 = _context["catch"](5);
+        case 11:
+          _context.prev = 11;
+          _context.t0 = _context["catch"](6);
           if (!((_context.t0 === null || _context.t0 === void 0 ? void 0 : (_err$response = _context.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) !== 404)) {
-            _context.next = 14;
+            _context.next = 15;
             break;
           }
           throw new Error(_context.t0);
-        case 14:
-          debug.log('delete ' + keyAclDoc.value + ' ' + _context.t0.response.status); // should test 404 and 2xx
         case 15:
+          debug.log('delete ' + keyAclDoc.value + ' ' + _context.t0.response.status); // should test 404 and 2xx
+        case 16:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[5, 10]]);
+    }, _callee, null, [[6, 11]]);
   }));
   return _setAcl.apply(this, arguments);
 }

package/lib/utils/keyHelpers/acl.js.map

@@ -1 +1 @@
-{"version":3,"file":"acl.js","names":["debug","_interopRequireWildcard","require","_solidLogic","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","setAcl","_x","_x2","_setAcl","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","keyDoc","aclBody","keyAclDoc","_err$response","wrap","_callee$","_context","prev","next","store","fetcher","load","any","sym","Error","webOperation","value","data","contentType","t0","response","status","log","stop","keyContainerAclBody","exports","me","concat","keyAclBody","keyAgent","length","split","pop"],"sources":["../../../src/utils/keyHelpers/acl.ts"],"sourcesContent":["import * as debug from '../../debug'\nimport { store } from 'solid-logic'\n\n/**\n * set ACL\n * @param keyDoc\n * @param aclBody\n */\nexport async function setAcl (keyDoc: string, aclBody: string) {\n  // Some servers don't present a Link http response header\n  // if the container doesn't exist yet, refetch the resource\n\n  await store.fetcher.load(keyDoc)\n\n  // FIXME: check the Why value on this quad:\n  // debug.log(store.statementsMatching(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl')))\n  const keyAclDoc = store.any(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl'))\n  if (!keyAclDoc) {\n    throw new Error('Key ACL doc not found!')\n  }\n\n  try {\n    await store.fetcher.webOperation('PUT', keyAclDoc.value, {\n      data: aclBody,\n      contentType: 'text/turtle'\n    })\n  } catch (err) {\n    if (err?.response?.status !== 404) { throw new Error(err) }\n    debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx\n  }\n}\n\n/**\n * key container ACL\n * @param me\n * @returns aclBody\n */\nexport const keyContainerAclBody = (me: string) => {\n  const aclBody = `\n@prefix : <#>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix key: <./>.\n\n:ReadWrite\n    a acl:Authorization;\n    acl:accessTo key:;\n    acl:default key:;\n    acl:agent <${me}>;\n    acl:mode acl:Read, acl:Write.\n`\n  return aclBody\n}\n\n/**\n * Read only ACL\n * @param keyDoc\n * @param me\n * @returns aclBody\n */\nexport const keyAclBody = (keyDoc, me) => {\n  let keyAgent = 'acl:agentClass foaf:Agent' // publicKey\n  if (me?.length) keyAgent = `acl:agent <${me}>` // privateKey\n  const aclBody = `\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n<#Read>\n    a acl:Authorization;\n    ${keyAgent};\n    acl:accessTo <${keyDoc.split('/').pop()}>;\n    acl:mode acl:Read.\n`\n  return aclBody\n}\n"],"mappings":"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"}
+{"version":3,"file":"acl.js","names":["debug","_interopRequireWildcard","require","_solidLogic","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","_typeof","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","setAcl","_x","_x2","_setAcl","apply","arguments","_asyncToGenerator2","_regenerator","mark","_callee","keyDoc","aclBody","keyAclDoc","_err$response","wrap","_callee$","_context","prev","next","store","fetcher","load","log","statementsMatching","sym","any","Error","webOperation","value","data","contentType","t0","response","status","stop","keyContainerAclBody","exports","me","concat","keyAclBody","keyAgent","length","split","pop"],"sources":["../../../src/utils/keyHelpers/acl.ts"],"sourcesContent":["import * as debug from '../../debug'\nimport { store } from 'solid-logic'\n\n/**\n * set ACL\n * @param keyDoc\n * @param aclBody\n */\nexport async function setAcl (keyDoc: string, aclBody: string) {\n  // Some servers don't present a Link http response header\n  // if the container doesn't exist yet, refetch the resource\n\n  await store.fetcher.load(keyDoc)\n\n  // FIXME: check the Why value on this quad:\n  debug.log(store.statementsMatching(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl')))\n  const keyAclDoc = store.any(store.sym(keyDoc), store.sym('http://www.iana.org/assignments/link-relations/acl'))\n  if (!keyAclDoc) {\n    throw new Error('Key ACL doc not found!')\n  }\n\n  try {\n    await store.fetcher.webOperation('PUT', keyAclDoc.value, {\n      data: aclBody,\n      contentType: 'text/turtle'\n    })\n  } catch (err) {\n    if (err?.response?.status !== 404) { throw new Error(err) }\n    debug.log('delete ' + keyAclDoc.value + ' ' + err.response.status) // should test 404 and 2xx\n  }\n}\n\n/**\n * key container ACL\n * @param me\n * @returns aclBody\n */\nexport const keyContainerAclBody = (me: string) => {\n  const aclBody = `\n@prefix : <#>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix key: <./>.\n\n:ReadWrite\n    a acl:Authorization;\n    acl:accessTo key:;\n    acl:default key:;\n    acl:agent <${me}>;\n    acl:mode acl:Read, acl:Write.\n`\n  return aclBody\n}\n\n/**\n * Read only ACL\n * @param keyDoc\n * @param me\n * @returns aclBody\n */\nexport const keyAclBody = (keyDoc, me) => {\n  let keyAgent = 'acl:agentClass foaf:Agent' // publicKey\n  if (me?.length) keyAgent = `acl:agent <${me}>` // privateKey\n  const aclBody = `\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n<#Read>\n    a acl:Authorization;\n    ${keyAgent};\n    acl:accessTo <${keyDoc.split('/').pop()}>;\n    acl:mode acl:Read.\n`\n  return aclBody\n}\n"],"mappings":"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"}

package/lib/versionInfo.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.versionInfo = void 0;
 var versionInfo = exports.versionInfo = {
-  buildTime: '2024-02-18T17:48:05Z',
-  commit: '8d90d955ac1077244eacf84984348914ebb6f99c',
+  buildTime: '2024-02-20T15:14:15Z',
+  commit: '9d930db7eba826ad9e82bf631f93ecf2ccd5e912',
   npmInfo: {
     'solid-ui': '2.4.32',
     npm: '8.19.4',

package/lib/versionInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"versionInfo.js","names":["versionInfo","exports","buildTime","commit","npmInfo","npm","node","v8","uv","zlib","brotli","ares","modules","nghttp2","napi","llhttp","openssl","cldr","icu","tz","unicode","ngtcp2","nghttp3"],"sources":["../src/versionInfo.ts"],"sourcesContent":["export const versionInfo = {\n  buildTime: '2024-02-18T17:48:05Z',\n  commit: '8d90d955ac1077244eacf84984348914ebb6f99c',\n  npmInfo:\n{\n  'solid-ui': '2.4.32',\n  npm: '8.19.4',\n  node: '16.20.2',\n  v8: '9.4.146.26-node.26',\n  uv: '1.43.0',\n  zlib: '1.2.11',\n  brotli: '1.0.9',\n  ares: '1.19.1',\n  modules: '93',\n  nghttp2: '1.47.0',\n  napi: '8',\n  llhttp: '6.0.11',\n  openssl: '1.1.1v+quic',\n  cldr: '41.0',\n  icu: '71.1',\n  tz: '2022f',\n  unicode: '14.0',\n  ngtcp2: '0.8.1',\n  nghttp3: '0.7.0'\n}\n}\n"],"mappings":";;;;;;AAAO,IAAMA,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG;EACzBE,SAAS,EAAE,sBAAsB;EACjCC,MAAM,EAAE,0CAA0C;EAClDC,OAAO,EACT;IACE,UAAU,EAAE,QAAQ;IACpBC,GAAG,EAAE,QAAQ;IACbC,IAAI,EAAE,SAAS;IACfC,EAAE,EAAE,oBAAoB;IACxBC,EAAE,EAAE,QAAQ;IACZC,IAAI,EAAE,QAAQ;IACdC,MAAM,EAAE,OAAO;IACfC,IAAI,EAAE,QAAQ;IACdC,OAAO,EAAE,IAAI;IACbC,OAAO,EAAE,QAAQ;IACjBC,IAAI,EAAE,GAAG;IACTC,MAAM,EAAE,QAAQ;IAChBC,OAAO,EAAE,aAAa;IACtBC,IAAI,EAAE,MAAM;IACZC,GAAG,EAAE,MAAM;IACXC,EAAE,EAAE,OAAO;IACXC,OAAO,EAAE,MAAM;IACfC,MAAM,EAAE,OAAO;IACfC,OAAO,EAAE;EACX;AACA,CAAC"}
+{"version":3,"file":"versionInfo.js","names":["versionInfo","exports","buildTime","commit","npmInfo","npm","node","v8","uv","zlib","brotli","ares","modules","nghttp2","napi","llhttp","openssl","cldr","icu","tz","unicode","ngtcp2","nghttp3"],"sources":["../src/versionInfo.ts"],"sourcesContent":["export const versionInfo = {\n  buildTime: '2024-02-20T15:14:15Z',\n  commit: '9d930db7eba826ad9e82bf631f93ecf2ccd5e912',\n  npmInfo:\n{\n  'solid-ui': '2.4.32',\n  npm: '8.19.4',\n  node: '16.20.2',\n  v8: '9.4.146.26-node.26',\n  uv: '1.43.0',\n  zlib: '1.2.11',\n  brotli: '1.0.9',\n  ares: '1.19.1',\n  modules: '93',\n  nghttp2: '1.47.0',\n  napi: '8',\n  llhttp: '6.0.11',\n  openssl: '1.1.1v+quic',\n  cldr: '41.0',\n  icu: '71.1',\n  tz: '2022f',\n  unicode: '14.0',\n  ngtcp2: '0.8.1',\n  nghttp3: '0.7.0'\n}\n}\n"],"mappings":";;;;;;AAAO,IAAMA,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAG;EACzBE,SAAS,EAAE,sBAAsB;EACjCC,MAAM,EAAE,0CAA0C;EAClDC,OAAO,EACT;IACE,UAAU,EAAE,QAAQ;IACpBC,GAAG,EAAE,QAAQ;IACbC,IAAI,EAAE,SAAS;IACfC,EAAE,EAAE,oBAAoB;IACxBC,EAAE,EAAE,QAAQ;IACZC,IAAI,EAAE,QAAQ;IACdC,MAAM,EAAE,OAAO;IACfC,IAAI,EAAE,QAAQ;IACdC,OAAO,EAAE,IAAI;IACbC,OAAO,EAAE,QAAQ;IACjBC,IAAI,EAAE,GAAG;IACTC,MAAM,EAAE,QAAQ;IAChBC,OAAO,EAAE,aAAa;IACtBC,IAAI,EAAE,MAAM;IACZC,GAAG,EAAE,MAAM;IACXC,EAAE,EAAE,OAAO;IACXC,OAAO,EAAE,MAAM;IACfC,MAAM,EAAE,OAAO;IACfC,OAAO,EAAE;EACX;AACA,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-ui",
-  "version": "2.4.32-8d90d955",
+  "version": "2.4.32-9d930db7",
   "description": "UI library for writing Solid read-write-web applications",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -108,8 +108,7 @@
     "husky": "^7.0.4",
     "isomorphic-fetch": "^3.0.0",
     "jest": "^27.5.1",
-    "jest-environment-jsdom": "^27.5.1",
-    "jsdom": "^16.7.0",
+    "jsdom": "^19.0.0",
     "lint-staged": "^12.5.0",
     "nock": "^13.4.0",
     "react": "^17.0.2",