matrix-js-sdk 41.8.0 → 41.9.0

package/lib/models/MSC3089TreeSpace.js

@@ -1,7 +1,5 @@
-import _asyncToGenerator from "@babel/runtime/helpers/asyncToGenerator";
+import _objectSpread from "@babel/runtime/helpers/objectSpread2";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /*
 Copyright 2021 The Matrix.org Foundation C.I.C.
 
@@ -28,7 +26,7 @@ import { KnownMembership } from "../@types/membership.js";
  * The recommended defaults for a tree space's power levels. Note that this
  * is UNSTABLE and subject to breaking changes without notice.
  */
-export var DEFAULT_TREE_POWER_LEVELS_TEMPLATE = {
+export const DEFAULT_TREE_POWER_LEVELS_TEMPLATE = {
   // Owner
   invite: 100,
   kick: 100,
@@ -57,7 +55,7 @@ export var DEFAULT_TREE_POWER_LEVELS_TEMPLATE = {
  * Ease-of-use representation for power levels represented as simple roles.
  * Note that this is UNSTABLE and subject to breaking changes without notice.
  */
-export var TreePermissions = /*#__PURE__*/function (TreePermissions) {
+export let TreePermissions = /*#__PURE__*/function (TreePermissions) {
   TreePermissions["Viewer"] = "viewer";
   // Default
   TreePermissions["Editor"] = "editor";
@@ -72,9 +70,9 @@ export var TreePermissions = /*#__PURE__*/function (TreePermissions) {
  */
 export class MSC3089TreeSpace {
   constructor(client, roomId) {
+    _defineProperty(this, "room", void 0);
     this.client = client;
     this.roomId = roomId;
-    _defineProperty(this, "room", void 0);
     this.room = this.client.getRoom(this.roomId);
     if (!this.room) throw new Error("Unknown room");
   }
@@ -92,12 +90,9 @@ export class MSC3089TreeSpace {
   get isTopLevel() {
     // XXX: This is absolutely not how you find out if the space is top level
     // but is safe for a managed usecase like we offer in the SDK.
-    var parentEvents = this.room.currentState.getStateEvents(EventType.SpaceParent);
-    if (!(parentEvents !== null && parentEvents !== void 0 && parentEvents.length)) return true;
-    return parentEvents.every(e => {
-      var _e$getContent;
-      return !((_e$getContent = e.getContent()) !== null && _e$getContent !== void 0 && _e$getContent["via"]);
-    });
+    const parentEvents = this.room.currentState.getStateEvents(EventType.SpaceParent);
+    if (!parentEvents?.length) return true;
+    return parentEvents.every(e => !e.getContent()?.["via"]);
   }
 
   /**
@@ -105,13 +100,10 @@ export class MSC3089TreeSpace {
    * @param name - The new name for the space.
    * @returns Promise which resolves when complete.
    */
-  setName(name) {
-    var _this = this;
-    return _asyncToGenerator(function* () {
-      yield _this.client.sendStateEvent(_this.roomId, EventType.RoomName, {
-        name
-      }, "");
-    })();
+  async setName(name) {
+    await this.client.sendStateEvent(this.roomId, EventType.RoomName, {
+      name
+    }, "");
   }
 
   /**
@@ -122,29 +114,21 @@ export class MSC3089TreeSpace {
    * directories/subspaces too, recursively.
    * @returns Promise which resolves when complete.
    */
-  invite(userId) {
-    var _arguments = arguments,
-      _this2 = this;
-    return _asyncToGenerator(function* () {
-      var andSubspaces = _arguments.length > 1 && _arguments[1] !== undefined ? _arguments[1] : true;
-      var promises = [_this2.retryInvite(userId)];
-      if (andSubspaces) {
-        promises.push(..._this2.getDirectories().map(d => d.invite(userId, andSubspaces)));
-      }
-      yield Promise.all(promises);
-    })();
+  async invite(userId, andSubspaces = true) {
+    const promises = [this.retryInvite(userId)];
+    if (andSubspaces) {
+      promises.push(...this.getDirectories().map(d => d.invite(userId, andSubspaces)));
+    }
+    await Promise.all(promises);
   }
-  retryInvite(userId) {
-    var _this3 = this;
-    return _asyncToGenerator(function* () {
-      yield simpleRetryOperation(() => _this3.client.invite(_this3.roomId, userId), e => {
-        // We don't want to retry permission errors forever...
-        if (e instanceof MatrixError && e.errcode === "M_FORBIDDEN") {
-          return false;
-        }
-        return true;
-      });
-    })();
+  async retryInvite(userId) {
+    await simpleRetryOperation(() => this.client.invite(this.roomId, userId), e => {
+      // We don't want to retry permission errors forever...
+      if (e instanceof MatrixError && e.errcode === "M_FORBIDDEN") {
+        return false;
+      }
+      return true;
+    });
   }
 
   /**
@@ -155,33 +139,29 @@ export class MSC3089TreeSpace {
    * @param role - The role to assign.
    * @returns Promise which resolves when complete.
    */
-  setPermissions(userId, role) {
-    var _this4 = this;
-    return _asyncToGenerator(function* () {
-      var _pls$events;
-      var currentPls = _this4.room.currentState.getStateEvents(EventType.RoomPowerLevels, "");
-      if (Array.isArray(currentPls)) throw new Error("Unexpected return type for power levels");
-      var pls = (currentPls === null || currentPls === void 0 ? void 0 : currentPls.getContent()) || {};
-      var viewLevel = pls["users_default"] || 0;
-      var editLevel = pls["events_default"] || 50;
-      var adminLevel = ((_pls$events = pls["events"]) === null || _pls$events === void 0 ? void 0 : _pls$events[EventType.RoomPowerLevels]) || 100;
-      var users = pls["users"] || {};
-      switch (role) {
-        case TreePermissions.Viewer:
-          users[userId] = viewLevel;
-          break;
-        case TreePermissions.Editor:
-          users[userId] = editLevel;
-          break;
-        case TreePermissions.Owner:
-          users[userId] = adminLevel;
-          break;
-        default:
-          throw new Error("Invalid role: " + role);
-      }
-      pls["users"] = users;
-      yield _this4.client.sendStateEvent(_this4.roomId, EventType.RoomPowerLevels, pls, "");
-    })();
+  async setPermissions(userId, role) {
+    const currentPls = this.room.currentState.getStateEvents(EventType.RoomPowerLevels, "");
+    if (Array.isArray(currentPls)) throw new Error("Unexpected return type for power levels");
+    const pls = currentPls?.getContent() || {};
+    const viewLevel = pls["users_default"] || 0;
+    const editLevel = pls["events_default"] || 50;
+    const adminLevel = pls["events"]?.[EventType.RoomPowerLevels] || 100;
+    const users = pls["users"] || {};
+    switch (role) {
+      case TreePermissions.Viewer:
+        users[userId] = viewLevel;
+        break;
+      case TreePermissions.Editor:
+        users[userId] = editLevel;
+        break;
+      case TreePermissions.Owner:
+        users[userId] = adminLevel;
+        break;
+      default:
+        throw new Error("Invalid role: " + role);
+    }
+    pls["users"] = users;
+    await this.client.sendStateEvent(this.roomId, EventType.RoomPowerLevels, pls, "");
   }
 
   /**
@@ -192,14 +172,13 @@ export class MSC3089TreeSpace {
    * @returns The permissions for the user, defaulting to Viewer.
    */
   getPermissions(userId) {
-    var _pls$events2, _pls$users;
-    var currentPls = this.room.currentState.getStateEvents(EventType.RoomPowerLevels, "");
+    const currentPls = this.room.currentState.getStateEvents(EventType.RoomPowerLevels, "");
     if (Array.isArray(currentPls)) throw new Error("Unexpected return type for power levels");
-    var pls = (currentPls === null || currentPls === void 0 ? void 0 : currentPls.getContent()) || {};
-    var viewLevel = pls["users_default"] || 0;
-    var editLevel = pls["events_default"] || 50;
-    var adminLevel = ((_pls$events2 = pls["events"]) === null || _pls$events2 === void 0 ? void 0 : _pls$events2[EventType.RoomPowerLevels]) || 100;
-    var userLevel = ((_pls$users = pls["users"]) === null || _pls$users === void 0 ? void 0 : _pls$users[userId]) || viewLevel;
+    const pls = currentPls?.getContent() || {};
+    const viewLevel = pls["users_default"] || 0;
+    const editLevel = pls["events_default"] || 50;
+    const adminLevel = pls["events"]?.[EventType.RoomPowerLevels] || 100;
+    const userLevel = pls["users"]?.[userId] || viewLevel;
     if (userLevel >= adminLevel) return TreePermissions.Owner;
     if (userLevel >= editLevel) return TreePermissions.Editor;
     return TreePermissions.Viewer;
@@ -210,18 +189,15 @@ export class MSC3089TreeSpace {
    * @param name - The name for the directory.
    * @returns Promise which resolves to the created directory.
    */
-  createDirectory(name) {
-    var _this5 = this;
-    return _asyncToGenerator(function* () {
-      var directory = yield _this5.client.unstableCreateFileTree(name);
-      yield _this5.client.sendStateEvent(_this5.roomId, EventType.SpaceChild, {
-        via: [_this5.client.getDomain()]
-      }, directory.roomId);
-      yield _this5.client.sendStateEvent(directory.roomId, EventType.SpaceParent, {
-        via: [_this5.client.getDomain()]
-      }, _this5.roomId);
-      return directory;
-    })();
+  async createDirectory(name) {
+    const directory = await this.client.unstableCreateFileTree(name);
+    await this.client.sendStateEvent(this.roomId, EventType.SpaceChild, {
+      via: [this.client.getDomain()]
+    }, directory.roomId);
+    await this.client.sendStateEvent(directory.roomId, EventType.SpaceParent, {
+      via: [this.client.getDomain()]
+    }, this.roomId);
+    return directory;
   }
 
   /**
@@ -229,13 +205,13 @@ export class MSC3089TreeSpace {
    * @returns The tree spaces (directories). May be empty, but not null.
    */
   getDirectories() {
-    var trees = [];
-    var children = this.room.currentState.getStateEvents(EventType.SpaceChild);
-    for (var child of children) {
+    const trees = [];
+    const children = this.room.currentState.getStateEvents(EventType.SpaceChild);
+    for (const child of children) {
       try {
-        var stateKey = child.getStateKey();
+        const stateKey = child.getStateKey();
         if (stateKey) {
-          var tree = this.client.unstableGetFileTreeSpace(stateKey);
+          const tree = this.client.unstableGetFileTreeSpace(stateKey);
           if (tree) trees.push(tree);
         }
       } catch (e) {
@@ -259,30 +235,27 @@ export class MSC3089TreeSpace {
    * Deletes the tree, kicking all members and deleting **all subdirectories**.
    * @returns Promise which resolves when complete.
    */
-  delete() {
-    var _this6 = this;
-    return _asyncToGenerator(function* () {
-      var subdirectories = _this6.getDirectories();
-      for (var dir of subdirectories) {
-        yield dir.delete();
-      }
-      var kickMemberships = [KnownMembership.Invite, KnownMembership.Knock, KnownMembership.Join];
-      var members = _this6.room.currentState.getStateEvents(EventType.RoomMember);
-      for (var member of members) {
-        var isNotUs = member.getStateKey() !== _this6.client.getUserId();
-        if (isNotUs && kickMemberships.includes(member.getContent().membership)) {
-          var stateKey = member.getStateKey();
-          if (!stateKey) {
-            throw new Error("State key not found for branch");
-          }
-          yield _this6.client.kick(_this6.roomId, stateKey, "Room deleted");
+  async delete() {
+    const subdirectories = this.getDirectories();
+    for (const dir of subdirectories) {
+      await dir.delete();
+    }
+    const kickMemberships = [KnownMembership.Invite, KnownMembership.Knock, KnownMembership.Join];
+    const members = this.room.currentState.getStateEvents(EventType.RoomMember);
+    for (const member of members) {
+      const isNotUs = member.getStateKey() !== this.client.getUserId();
+      if (isNotUs && kickMemberships.includes(member.getContent().membership)) {
+        const stateKey = member.getStateKey();
+        if (!stateKey) {
+          throw new Error("State key not found for branch");
         }
+        await this.client.kick(this.roomId, stateKey, "Room deleted");
       }
-      yield _this6.client.leave(_this6.roomId);
-    })();
+    }
+    await this.client.leave(this.roomId);
   }
   getOrderedChildren(children) {
-    var ordered = children.map(c => ({
+    const ordered = children.map(c => ({
       roomId: c.getStateKey(),
       order: c.getContent()["order"]
     })).filter(c => c.roomId);
@@ -292,15 +265,14 @@ export class MSC3089TreeSpace {
       } else if (!a.order && b.order) {
         return 1;
       } else if (!a.order && !b.order) {
-        var _roomA$currentState$g, _roomA$currentState$g2, _roomB$currentState$g, _roomB$currentState$g2;
-        var roomA = this.client.getRoom(a.roomId);
-        var roomB = this.client.getRoom(b.roomId);
+        const roomA = this.client.getRoom(a.roomId);
+        const roomB = this.client.getRoom(b.roomId);
         if (!roomA || !roomB) {
           // just don't bother trying to do more partial sorting
           return lexicographicCompare(a.roomId, b.roomId);
         }
-        var createTsA = (_roomA$currentState$g = (_roomA$currentState$g2 = roomA.currentState.getStateEvents(EventType.RoomCreate, "")) === null || _roomA$currentState$g2 === void 0 ? void 0 : _roomA$currentState$g2.getTs()) !== null && _roomA$currentState$g !== void 0 ? _roomA$currentState$g : 0;
-        var createTsB = (_roomB$currentState$g = (_roomB$currentState$g2 = roomB.currentState.getStateEvents(EventType.RoomCreate, "")) === null || _roomB$currentState$g2 === void 0 ? void 0 : _roomB$currentState$g2.getTs()) !== null && _roomB$currentState$g !== void 0 ? _roomB$currentState$g : 0;
+        const createTsA = roomA.currentState.getStateEvents(EventType.RoomCreate, "")?.getTs() ?? 0;
+        const createTsB = roomB.currentState.getStateEvents(EventType.RoomCreate, "")?.getTs() ?? 0;
         if (createTsA === createTsB) {
           return lexicographicCompare(a.roomId, b.roomId);
         }
@@ -313,15 +285,15 @@ export class MSC3089TreeSpace {
     return ordered;
   }
   getParentRoom() {
-    var parents = this.room.currentState.getStateEvents(EventType.SpaceParent);
-    var parent = parents[0]; // XXX: Wild assumption
+    const parents = this.room.currentState.getStateEvents(EventType.SpaceParent);
+    const parent = parents[0]; // XXX: Wild assumption
     if (!parent) throw new Error("Expected to have a parent in a non-top level space");
 
     // XXX: We are assuming the parent is a valid tree space.
     // We probably don't need to validate the parent room state for this usecase though.
-    var stateKey = parent.getStateKey();
+    const stateKey = parent.getStateKey();
     if (!stateKey) throw new Error("No state key found for parent");
-    var parentRoom = this.client.getRoom(stateKey);
+    const parentRoom = this.client.getRoom(stateKey);
     if (!parentRoom) throw new Error("Unable to locate room for parent");
     return parentRoom;
   }
@@ -333,9 +305,9 @@ export class MSC3089TreeSpace {
    */
   getOrder() {
     if (this.isTopLevel) return -1;
-    var parentRoom = this.getParentRoom();
-    var children = parentRoom.currentState.getStateEvents(EventType.SpaceChild);
-    var ordered = this.getOrderedChildren(children);
+    const parentRoom = this.getParentRoom();
+    const children = parentRoom.currentState.getStateEvents(EventType.SpaceChild);
+    const ordered = this.getOrderedChildren(children);
     return ordered.findIndex(c => c.roomId === this.roomId);
   }
 
@@ -347,105 +319,100 @@ export class MSC3089TreeSpace {
    * @returns Promise which resolves when complete.
    * @throws Throws if this is a top level space.
    */
-  setOrder(index) {
-    var _this7 = this;
-    return _asyncToGenerator(function* () {
-      var _currentChild$getCont2;
-      if (_this7.isTopLevel) throw new Error("Cannot set order of top level spaces currently");
-      var parentRoom = _this7.getParentRoom();
-      var children = parentRoom.currentState.getStateEvents(EventType.SpaceChild);
-      var ordered = _this7.getOrderedChildren(children);
-      index = Math.max(Math.min(index, ordered.length - 1), 0);
-      var currentIndex = _this7.getOrder();
-      var movingUp = currentIndex < index;
-      if (movingUp && index === ordered.length - 1) {
-        index--;
-      } else if (!movingUp && index === 0) {
-        index++;
+  async setOrder(index) {
+    if (this.isTopLevel) throw new Error("Cannot set order of top level spaces currently");
+    const parentRoom = this.getParentRoom();
+    const children = parentRoom.currentState.getStateEvents(EventType.SpaceChild);
+    const ordered = this.getOrderedChildren(children);
+    index = Math.max(Math.min(index, ordered.length - 1), 0);
+    const currentIndex = this.getOrder();
+    const movingUp = currentIndex < index;
+    if (movingUp && index === ordered.length - 1) {
+      index--;
+    } else if (!movingUp && index === 0) {
+      index++;
+    }
+    const prev = ordered[movingUp ? index : index - 1];
+    const next = ordered[movingUp ? index + 1 : index];
+    let newOrder = DEFAULT_ALPHABET[0];
+    let ensureBeforeIsSane = false;
+    if (!prev) {
+      // Move to front
+      if (next?.order) {
+        newOrder = prevString(next.order);
       }
-      var prev = ordered[movingUp ? index : index - 1];
-      var next = ordered[movingUp ? index + 1 : index];
-      var newOrder = DEFAULT_ALPHABET[0];
-      var ensureBeforeIsSane = false;
-      if (!prev) {
-        // Move to front
-        if (next !== null && next !== void 0 && next.order) {
-          newOrder = prevString(next.order);
-        }
-      } else if (index === ordered.length - 1) {
-        // Move to back
-        if (next !== null && next !== void 0 && next.order) {
-          newOrder = nextString(next.order);
+    } else if (index === ordered.length - 1) {
+      // Move to back
+      if (next?.order) {
+        newOrder = nextString(next.order);
+      }
+    } else {
+      // Move somewhere in the middle
+      const startOrder = prev?.order;
+      const endOrder = next?.order;
+      if (startOrder && endOrder) {
+        if (startOrder === endOrder) {
+          // Error case: just move +1 to break out of awful math
+          newOrder = nextString(startOrder);
+        } else {
+          newOrder = averageBetweenStrings(startOrder, endOrder);
         }
       } else {
-        // Move somewhere in the middle
-        var startOrder = prev === null || prev === void 0 ? void 0 : prev.order;
-        var endOrder = next === null || next === void 0 ? void 0 : next.order;
-        if (startOrder && endOrder) {
-          if (startOrder === endOrder) {
-            // Error case: just move +1 to break out of awful math
-            newOrder = nextString(startOrder);
-          } else {
-            newOrder = averageBetweenStrings(startOrder, endOrder);
-          }
+        if (startOrder) {
+          // We're at the end (endOrder is null, so no explicit order)
+          newOrder = nextString(startOrder);
+        } else if (endOrder) {
+          // We're at the start (startOrder is null, so nothing before us)
+          newOrder = prevString(endOrder);
         } else {
-          if (startOrder) {
-            // We're at the end (endOrder is null, so no explicit order)
-            newOrder = nextString(startOrder);
-          } else if (endOrder) {
-            // We're at the start (startOrder is null, so nothing before us)
-            newOrder = prevString(endOrder);
-          } else {
-            // Both points are unknown. We're likely in a range where all the children
-            // don't have particular order values, so we may need to update them too.
-            // The other possibility is there's only us as a child, but we should have
-            // shown up in the other states.
-            ensureBeforeIsSane = true;
-          }
+          // Both points are unknown. We're likely in a range where all the children
+          // don't have particular order values, so we may need to update them too.
+          // The other possibility is there's only us as a child, but we should have
+          // shown up in the other states.
+          ensureBeforeIsSane = true;
         }
       }
-      if (ensureBeforeIsSane) {
-        // We were asked by the order algorithm to prepare the moving space for a landing
-        // in the undefined order part of the order array, which means we need to update the
-        // spaces that come before it with a stable order value.
-        var lastOrder;
-        for (var i = 0; i <= index; i++) {
-          var target = ordered[i];
-          if (i === 0) {
-            lastOrder = target.order;
-          }
-          if (!target.order) {
-            var _currentChild$getCont;
-            // XXX: We should be creating gaps to avoid conflicts
-            lastOrder = lastOrder ? nextString(lastOrder) : DEFAULT_ALPHABET[0];
-            var _currentChild = parentRoom.currentState.getStateEvents(EventType.SpaceChild, target.roomId);
-            var _content = (_currentChild$getCont = _currentChild === null || _currentChild === void 0 ? void 0 : _currentChild.getContent()) !== null && _currentChild$getCont !== void 0 ? _currentChild$getCont : {
-              via: [_this7.client.getDomain()]
-            };
-            yield _this7.client.sendStateEvent(parentRoom.roomId, EventType.SpaceChild, _objectSpread(_objectSpread({}, _content), {}, {
-              order: lastOrder
-            }), target.roomId);
-          } else {
-            lastOrder = target.order;
-          }
+    }
+    if (ensureBeforeIsSane) {
+      // We were asked by the order algorithm to prepare the moving space for a landing
+      // in the undefined order part of the order array, which means we need to update the
+      // spaces that come before it with a stable order value.
+      let lastOrder;
+      for (let i = 0; i <= index; i++) {
+        const target = ordered[i];
+        if (i === 0) {
+          lastOrder = target.order;
         }
-        if (lastOrder) {
-          newOrder = nextString(lastOrder);
+        if (!target.order) {
+          // XXX: We should be creating gaps to avoid conflicts
+          lastOrder = lastOrder ? nextString(lastOrder) : DEFAULT_ALPHABET[0];
+          const currentChild = parentRoom.currentState.getStateEvents(EventType.SpaceChild, target.roomId);
+          const content = currentChild?.getContent() ?? {
+            via: [this.client.getDomain()]
+          };
+          await this.client.sendStateEvent(parentRoom.roomId, EventType.SpaceChild, _objectSpread(_objectSpread({}, content), {}, {
+            order: lastOrder
+          }), target.roomId);
+        } else {
+          lastOrder = target.order;
         }
       }
+      if (lastOrder) {
+        newOrder = nextString(lastOrder);
+      }
+    }
 
-      // TODO: Deal with order conflicts by reordering
+    // TODO: Deal with order conflicts by reordering
 
-      // Now we can finally update our own order state
-      var currentChild = parentRoom.currentState.getStateEvents(EventType.SpaceChild, _this7.roomId);
-      var content = (_currentChild$getCont2 = currentChild === null || currentChild === void 0 ? void 0 : currentChild.getContent()) !== null && _currentChild$getCont2 !== void 0 ? _currentChild$getCont2 : {
-        via: [_this7.client.getDomain()]
-      };
-      yield _this7.client.sendStateEvent(parentRoom.roomId, EventType.SpaceChild, _objectSpread(_objectSpread({}, content), {}, {
-        // TODO: Safely constrain to 50 character limit required by spaces.
-        order: newOrder
-      }), _this7.roomId);
-    })();
+    // Now we can finally update our own order state
+    const currentChild = parentRoom.currentState.getStateEvents(EventType.SpaceChild, this.roomId);
+    const content = currentChild?.getContent() ?? {
+      via: [this.client.getDomain()]
+    };
+    await this.client.sendStateEvent(parentRoom.roomId, EventType.SpaceChild, _objectSpread(_objectSpread({}, content), {}, {
+      // TODO: Safely constrain to 50 character limit required by spaces.
+      order: newOrder
+    }), this.roomId);
   }
 
   /**
@@ -457,36 +424,34 @@ export class MSC3089TreeSpace {
    * @param additionalContent - Optional event content fields to include in the message.
    * @returns Promise which resolves to the file event's sent response.
    */
-  createFile(name, encryptedContents, info, additionalContent) {
-    var _this8 = this;
-    return _asyncToGenerator(function* () {
-      var _yield$_this8$client$ = yield _this8.client.uploadContent(encryptedContents, {
-          includeFilename: false
-        }),
-        mxc = _yield$_this8$client$.content_uri;
-      info.url = mxc;
-      var fileContent = {
-        msgtype: MsgType.File,
-        body: name,
-        url: mxc,
-        file: info
-      };
-      additionalContent = additionalContent !== null && additionalContent !== void 0 ? additionalContent : {};
-      if (additionalContent["m.new_content"]) {
-        // We do the right thing according to the spec, but due to how relations are
-        // handled we also end up duplicating this information to the regular `content`
-        // as well.
-        additionalContent["m.new_content"] = fileContent;
-      }
-      var res = yield _this8.client.sendMessage(_this8.roomId, _objectSpread(_objectSpread(_objectSpread({}, additionalContent), fileContent), {}, {
-        [UNSTABLE_MSC3089_LEAF.name]: {}
-      }));
-      yield _this8.client.sendStateEvent(_this8.roomId, UNSTABLE_MSC3089_BRANCH.name, {
-        active: true,
-        name: name
-      }, res["event_id"]);
-      return res;
-    })();
+  async createFile(name, encryptedContents, info, additionalContent) {
+    const {
+      content_uri: mxc
+    } = await this.client.uploadContent(encryptedContents, {
+      includeFilename: false
+    });
+    info.url = mxc;
+    const fileContent = {
+      msgtype: MsgType.File,
+      body: name,
+      url: mxc,
+      file: info
+    };
+    additionalContent = additionalContent ?? {};
+    if (additionalContent["m.new_content"]) {
+      // We do the right thing according to the spec, but due to how relations are
+      // handled we also end up duplicating this information to the regular `content`
+      // as well.
+      additionalContent["m.new_content"] = fileContent;
+    }
+    const res = await this.client.sendMessage(this.roomId, _objectSpread(_objectSpread(_objectSpread({}, additionalContent), fileContent), {}, {
+      [UNSTABLE_MSC3089_LEAF.name]: {}
+    }));
+    await this.client.sendStateEvent(this.roomId, UNSTABLE_MSC3089_BRANCH.name, {
+      active: true,
+      name: name
+    }, res["event_id"]);
+    return res;
   }
 
   /**
@@ -495,7 +460,7 @@ export class MSC3089TreeSpace {
    * @returns The file, or null if not found.
    */
   getFile(fileEventId) {
-    var branch = this.room.currentState.getStateEvents(UNSTABLE_MSC3089_BRANCH.name, fileEventId);
+    const branch = this.room.currentState.getStateEvents(UNSTABLE_MSC3089_BRANCH.name, fileEventId);
     return branch ? new MSC3089Branch(this.client, branch, this) : null;
   }
 
@@ -512,8 +477,7 @@ export class MSC3089TreeSpace {
    * @returns The known files. May be empty, but not null.
    */
   listAllFiles() {
-    var _this$room$currentSta;
-    var branches = (_this$room$currentSta = this.room.currentState.getStateEvents(UNSTABLE_MSC3089_BRANCH.name)) !== null && _this$room$currentSta !== void 0 ? _this$room$currentSta : [];
+    const branches = this.room.currentState.getStateEvents(UNSTABLE_MSC3089_BRANCH.name) ?? [];
     return branches.map(e => new MSC3089Branch(this.client, e, this));
   }
 }