chore: fix linting and formatting due to merge

spec/TestClient.ts

@@ -29,7 +29,12 @@ import type { IE2EKeyReceiver } from "./test-utils/E2EKeyReceiver";
 import { logger } from "../src/logger";
 import { syncPromise } from "./test-utils/test-utils";
 import { createClient, type IStartClientOpts } from "../src/matrix";
-import { type ICreateClientOpts, type IDownloadKeyResult, type MatrixClient, PendingEventOrdering } from "../src/client";
+import {
+    type ICreateClientOpts,
+    type IDownloadKeyResult,
+    type MatrixClient,
+    PendingEventOrdering,
+} from "../src/client";
 import { type IKeysUploadResponse, type IUploadKeysRequest } from "../src/client";
 import { type ISyncResponder } from "./test-utils/SyncResponder";
 

spec/integ/crypto/crypto.spec.ts

@@ -53,7 +53,7 @@ import {
     type IEvent,
     type IStartClientOpts,
     type MatrixClient,
-    MatrixEvent,
+    type MatrixEvent,
     MatrixEventEvent,
     PendingEventOrdering,
 } from "../../../src/matrix";

spec/integ/crypto/megolm-backup.spec.ts

@@ -37,7 +37,7 @@ import * as testData from "../../test-utils/test-data";
 import { type KeyBackupInfo, type KeyBackupSession } from "../../../src/crypto-api/keybackup";
 import { flushPromises } from "../../test-utils/flushPromises";
 import { defer, type IDeferred } from "../../../src/utils";
-import { decodeRecoveryKey, DecryptionFailureCode, CryptoEvent, CryptoApi } from "../../../src/crypto-api";
+import { decodeRecoveryKey, DecryptionFailureCode, CryptoEvent, type CryptoApi } from "../../../src/crypto-api";
 import { type KeyBackup } from "../../../src/rust-crypto/backup.ts";
 
 const ROOM_ID = testData.TEST_ROOM_ID;

spec/integ/matrix-client-methods.spec.ts

@@ -13,8 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-import { type Mocked } from "jest-mock";
-import HttpBackend from "matrix-mock-request";
 
 import type HttpBackend from "matrix-mock-request";
 import * as utils from "../test-utils/test-utils";

spec/unit/models/event.spec.ts

@@ -27,7 +27,11 @@ import {
     TweakName,
 } from "../../../src";
 import { DecryptionFailureCode } from "../../../src/crypto-api";
-import { CryptoBackend, DecryptionError, EventDecryptionResult } from "../../../src/common-crypto/CryptoBackend";
+import {
+    type CryptoBackend,
+    DecryptionError,
+    type EventDecryptionResult,
+} from "../../../src/common-crypto/CryptoBackend";
 
 describe("MatrixEvent", () => {
     it("should create copies of itself", () => {

spec/unit/room.spec.ts

@@ -58,7 +58,7 @@ import { getMockClientWithEventEmitter, mockClientMethodsUser } from "../test-ut
 import { logger } from "../../src/logger";
 import { flushPromises } from "../test-utils/flushPromises";
 import { KnownMembership } from "../../src/@types/membership";
-import { CryptoBackend } from "../../src/common-crypto/CryptoBackend";
+import type { CryptoBackend } from "../../src/common-crypto/CryptoBackend";
 
 describe("Room", function () {
     const roomId = "!foo:bar";

src/client.ts

@@ -88,9 +88,15 @@ import { type MatrixScheduler } from "./scheduler.ts";
 import { type BeaconEvent, type BeaconEventHandlerMap } from "./models/beacon.ts";
 import { type AuthDict } from "./interactive-auth.ts";
 import { type IMinimalEvent, type IRoomEvent, type IStateEvent } from "./sync-accumulator.ts";
-import { EventTimelineSet } from "./models/event-timeline-set.ts";
+import type { EventTimelineSet } from "./models/event-timeline-set.ts";
 import * as ContentHelpers from "./content-helpers.ts";
-import { NotificationCountType, type Room, type RoomEvent, type RoomEventHandlerMap, type RoomNameState } from "./models/room.ts";
+import {
+    NotificationCountType,
+    type Room,
+    type RoomEvent,
+    type RoomEventHandlerMap,
+    type RoomNameState,
+} from "./models/room.ts";
 import { RoomMemberEvent, type RoomMemberEventHandlerMap } from "./models/room-member.ts";
 import { type IPowerLevelsContent, type RoomStateEvent, type RoomStateEventHandlerMap } from "./models/room-state.ts";
 import {
@@ -171,7 +177,12 @@ import {
 } from "./@types/PushRules.ts";
 import { type IThreepid } from "./@types/threepids.ts";
 import { type CryptoStore } from "./crypto/store/base.ts";
-import { GroupCall, type GroupCallIntent, type GroupCallType, type IGroupCallDataChannelOptions } from "./webrtc/groupCall.ts";
+import {
+    GroupCall,
+    type GroupCallIntent,
+    type GroupCallType,
+    type IGroupCallDataChannelOptions,
+} from "./webrtc/groupCall.ts";
 import { MediaHandler } from "./webrtc/mediaHandler.ts";
 import {
     type ILoginFlowsResponse,
@@ -210,7 +221,11 @@ import {
     type CryptoEventHandlerMap,
     type CryptoCallbacks,
 } from "./crypto-api/index.ts";
-import { type SecretStorageKeyDescription, type ServerSideSecretStorage, type ServerSideSecretStorageImpl } from "./secret-storage.ts";
+import {
+    type SecretStorageKeyDescription,
+    type ServerSideSecretStorage,
+    ServerSideSecretStorageImpl,
+} from "./secret-storage.ts";
 import { type RegisterRequest, type RegisterResponse } from "./@types/registration.ts";
 import { MatrixRTCSessionManager } from "./matrixrtc/MatrixRTCSessionManager.ts";
 import { getRelationsThreadFilter } from "./thread-utils.ts";
@@ -219,7 +234,11 @@ import { type RoomMessageEventContent, type StickerEventContent } from "./@types
 import { type ImageInfo } from "./@types/media.ts";
 import { type Capabilities, ServerCapabilities } from "./serverCapabilities.ts";
 import { sha256 } from "./digest.ts";
-import { discoverAndValidateOIDCIssuerWellKnown, type OidcClientConfig, validateAuthMetadataAndKeys } from "./oidc/index.ts";
+import {
+    discoverAndValidateOIDCIssuerWellKnown,
+    type OidcClientConfig,
+    validateAuthMetadataAndKeys,
+} from "./oidc/index.ts";
 import { type EmptyObject } from "./@types/common.ts";
 
 export type Store = IStore;

src/crypto/store/localStorage-crypto-store.ts

@@ -26,8 +26,8 @@ import {
     type Mode,
     type SecretStorePrivateKeys,
     SESSION_BATCH_SIZE,
-    InboundGroupSessionData,
-    IRoomEncryption,
+    type InboundGroupSessionData,
+    type IRoomEncryption,
 } from "./base.ts";
 import { type CrossSigningKeyInfo } from "../../crypto-api/index.ts";