Switch to importing more things from the main js-sdk export (#11394)

.eslintrc.js

@@ -154,6 +154,26 @@ module.exports = {
                         name: "matrix-js-sdk/src/sync",
                         message: "Please use matrix-js-sdk/src/matrix instead",
                     },
+                    {
+                        name: "matrix-js-sdk/src/timeline-window",
+                        message: "Please use matrix-js-sdk/src/matrix instead",
+                    },
+                    {
+                        name: "matrix-js-sdk/src/store/indexeddb",
+                        message: "Please use matrix-js-sdk/src/matrix instead",
+                    },
+                    {
+                        name: "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store",
+                        message: "Please use matrix-js-sdk/src/matrix instead",
+                    },
+                    {
+                        name: "matrix-js-sdk/src/crypto/store/localStorage-crypto-store",
+                        message: "Please use matrix-js-sdk/src/matrix instead",
+                    },
+                    {
+                        name: "matrix-js-sdk/src/models/thread",
+                        message: "Please use matrix-js-sdk/src/matrix instead",
+                    },
                     {
                         name: "matrix-react-sdk",
                         message: "Please use matrix-react-sdk/src/index instead",

src/ContentMessages.ts

@@ -26,11 +26,11 @@ import {
     MatrixEvent,
     UploadOpts,
     UploadProgress,
+    THREAD_RELATION_TYPE,
 } from "matrix-js-sdk/src/matrix";
 import encrypt from "matrix-encrypt-attachment";
 import extractPngChunks from "png-chunks-extract";
 import { logger } from "matrix-js-sdk/src/logger";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 import { removeElement } from "matrix-js-sdk/src/utils";
 
 import {

src/components/structures/FilePanel.tsx

@@ -25,8 +25,8 @@ import {
     MatrixEventEvent,
     Room,
     RoomEvent,
+    TimelineWindow,
 } from "matrix-js-sdk/src/matrix";
-import { TimelineWindow } from "matrix-js-sdk/src/timeline-window";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import { MatrixClientPeg } from "../../MatrixClientPeg";

src/components/structures/RoomSearchView.tsx

@@ -15,8 +15,12 @@ limitations under the License.
 */
 
 import React, { forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react";
-import { ISearchResults, IThreadBundledRelationship, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import {
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
+    ISearchResults,
+    IThreadBundledRelationship,
+    MatrixEvent,
+    THREAD_RELATION_TYPE,
+} from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 
 import ScrollPanel from "./ScrollPanel";

src/components/structures/RoomView.tsx

@@ -36,12 +36,12 @@ import {
     ClientEvent,
     MatrixError,
     ISearchResults,
+    THREAD_RELATION_TYPE,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { CallState, MatrixCall } from "matrix-js-sdk/src/webrtc/call";
 import { throttle } from "lodash";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import shouldHideEvent from "../../shouldHideEvent";
 import { _t } from "../../languageHandler";

src/components/structures/ThreadPanel.tsx

@@ -16,8 +16,7 @@ limitations under the License.
 
 import { Optional } from "matrix-events-sdk";
 import React, { useContext, useEffect, useRef, useState } from "react";
-import { EventTimelineSet, Room } from "matrix-js-sdk/src/matrix";
+import { EventTimelineSet, Room, Thread } from "matrix-js-sdk/src/matrix";
-import { Thread } from "matrix-js-sdk/src/models/thread";
 
 import BaseCard from "../views/right_panel/BaseCard";
 import ResizeNotifier from "../../utils/ResizeNotifier";

src/components/structures/ThreadView.tsx

@@ -15,8 +15,15 @@ limitations under the License.
 */
 
 import React, { createRef, KeyboardEvent } from "react";
-import { Thread, THREAD_RELATION_TYPE, ThreadEvent } from "matrix-js-sdk/src/models/thread";
+import {
-import { Room, RoomEvent, IEventRelation, MatrixEvent } from "matrix-js-sdk/src/matrix";
+    Thread,
+    THREAD_RELATION_TYPE,
+    ThreadEvent,
+    Room,
+    RoomEvent,
+    IEventRelation,
+    MatrixEvent,
+} from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import classNames from "classnames";
 

src/components/structures/TimelinePanel.tsx

@@ -34,11 +34,12 @@ import {
     Relations,
     MatrixError,
     SyncState,
+    TimelineWindow,
+    Thread,
+    ThreadEvent,
 } from "matrix-js-sdk/src/matrix";
-import { TimelineWindow } from "matrix-js-sdk/src/timeline-window";
 import { debounce, findLastIndex, throttle } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
-import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
 import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 
 import SettingsStore from "../../settings/SettingsStore";

src/components/views/context_menus/MessageContextMenu.tsx

@@ -25,9 +25,9 @@ import {
     EventType,
     RelationType,
     Relations,
+    Thread,
 } from "matrix-js-sdk/src/matrix";
 import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
-import { Thread } from "matrix-js-sdk/src/models/thread";
 
 import { MatrixClientPeg } from "../../../MatrixClientPeg";
 import dis from "../../../dispatcher/dispatcher";

src/components/views/dialogs/devtools/RoomNotifications.tsx

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { NotificationCountType, Room } from "matrix-js-sdk/src/matrix";
+import { NotificationCountType, Room, Thread } from "matrix-js-sdk/src/matrix";
-import { Thread } from "matrix-js-sdk/src/models/thread";
 import React, { useContext } from "react";
 import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 import { ReadReceipt } from "matrix-js-sdk/src/models/read-receipt";

src/components/views/location/shareLocation.ts

@@ -14,11 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient, IContent, IEventRelation, MatrixError } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, IContent, IEventRelation, MatrixError, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix";
 import { makeLocationContent, makeBeaconInfoContent } from "matrix-js-sdk/src/content-helpers";
 import { logger } from "matrix-js-sdk/src/logger";
 import { LocationAssetType } from "matrix-js-sdk/src/@types/location";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import { _t } from "../../../languageHandler";
 import Modal from "../../../Modal";

src/components/views/right_panel/LegacyRoomHeaderButtons.tsx

@@ -20,8 +20,7 @@ limitations under the License.
 
 import React from "react";
 import classNames from "classnames";
-import { NotificationCountType, Room, RoomEvent } from "matrix-js-sdk/src/matrix";
+import { NotificationCountType, Room, RoomEvent, ThreadEvent } from "matrix-js-sdk/src/matrix";
-import { ThreadEvent } from "matrix-js-sdk/src/models/thread";
 
 import { _t } from "../../../languageHandler";
 import HeaderButton from "./HeaderButton";

src/components/views/right_panel/TimelineCard.tsx

@@ -15,8 +15,14 @@ limitations under the License.
 */
 
 import React from "react";
-import { IEventRelation, MatrixEvent, NotificationCountType, Room, EventTimelineSet } from "matrix-js-sdk/src/matrix";
+import {
-import { Thread } from "matrix-js-sdk/src/models/thread";
+    IEventRelation,
+    MatrixEvent,
+    NotificationCountType,
+    Room,
+    EventTimelineSet,
+    Thread,
+} from "matrix-js-sdk/src/matrix";
 
 import BaseCard from "./BaseCard";
 import ResizeNotifier from "../../../utils/ResizeNotifier";

src/components/views/rooms/EventTile.tsx

@@ -29,8 +29,9 @@ import {
     Room,
     RoomEvent,
     Relations,
+    Thread,
+    ThreadEvent,
 } from "matrix-js-sdk/src/matrix";
-import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
 import { logger } from "matrix-js-sdk/src/logger";
 import { CallErrorCode } from "matrix-js-sdk/src/webrtc/call";
 import { CryptoEvent } from "matrix-js-sdk/src/crypto";

src/components/views/rooms/MessageComposer.tsx

@@ -16,9 +16,15 @@ limitations under the License.
 
 import React, { createRef, ReactNode } from "react";
 import classNames from "classnames";
-import { IEventRelation, MatrixEvent, Room, RoomMember, EventType } from "matrix-js-sdk/src/matrix";
+import {
+    IEventRelation,
+    MatrixEvent,
+    Room,
+    RoomMember,
+    EventType,
+    THREAD_RELATION_TYPE,
+} from "matrix-js-sdk/src/matrix";
 import { Optional } from "matrix-events-sdk";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import { _t } from "../../../languageHandler";
 import { MatrixClientPeg } from "../../../MatrixClientPeg";

src/components/views/rooms/MessageComposerButtons.tsx

@@ -15,10 +15,9 @@ limitations under the License.
 */
 
 import classNames from "classnames";
-import { IEventRelation, Room, MatrixClient } from "matrix-js-sdk/src/matrix";
+import { IEventRelation, Room, MatrixClient, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix";
 import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 import React, { createContext, ReactElement, ReactNode, useContext, useRef } from "react";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import { _t } from "../../../languageHandler";
 import AccessibleTooltipButton from "../elements/AccessibleTooltipButton";

src/components/views/rooms/SendMessageComposer.tsx

@@ -25,11 +25,11 @@ import {
     EventType,
     MsgType,
     RelationType,
+    THREAD_RELATION_TYPE,
 } from "matrix-js-sdk/src/matrix";
 import { DebouncedFunc, throttle } from "lodash";
 import { logger } from "matrix-js-sdk/src/logger";
 import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import dis from "../../../dispatcher/dispatcher";
 import EditorModel from "../../../editor/model";

src/components/views/rooms/ThreadSummary.tsx

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import React, { useContext, useState } from "react";
-import { Thread, ThreadEvent } from "matrix-js-sdk/src/models/thread";
+import { Thread, ThreadEvent, IContent, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix";
-import { IContent, MatrixEvent, MatrixEventEvent } from "matrix-js-sdk/src/matrix";
 
 import { _t } from "../../../languageHandler";
 import { CardContext } from "../right_panel/context";

src/components/views/rooms/wysiwyg_composer/utils/event.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, MatrixEvent, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import EditorStateTransfer from "../../../../../utils/EditorStateTransfer";
 import { IRoomState } from "../../../../structures/RoomView";

src/components/views/rooms/wysiwyg_composer/utils/message.ts

@@ -15,8 +15,14 @@ limitations under the License.
 */
 
 import { Composer as ComposerEvent } from "@matrix-org/analytics-events/types/typescript/Composer";
-import { IContent, IEventRelation, MatrixEvent, ISendEventResponse, MatrixClient } from "matrix-js-sdk/src/matrix";
+import {
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
+    IContent,
+    IEventRelation,
+    MatrixEvent,
+    ISendEventResponse,
+    MatrixClient,
+    THREAD_RELATION_TYPE,
+} from "matrix-js-sdk/src/matrix";
 
 import { PosthogAnalytics } from "../../../../../PosthogAnalytics";
 import SettingsStore from "../../../../../settings/SettingsStore";

src/indexing/EventIndex.ts

@@ -35,8 +35,9 @@ import {
     IResultRoomEvents,
     SyncStateData,
     SyncState,
+    TimelineIndex,
+    TimelineWindow,
 } from "matrix-js-sdk/src/matrix";
-import { TimelineIndex, TimelineWindow } from "matrix-js-sdk/src/timeline-window";
 import { sleep } from "matrix-js-sdk/src/utils";
 import { logger } from "matrix-js-sdk/src/logger";
 

src/stores/room-list/MessagePreviewStore.ts

@@ -14,10 +14,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { Room, RelationType, MatrixEvent } from "matrix-js-sdk/src/matrix";
+import { Room, RelationType, MatrixEvent, Thread } from "matrix-js-sdk/src/matrix";
 import { isNullOrUndefined } from "matrix-js-sdk/src/utils";
 import { M_POLL_START } from "matrix-js-sdk/src/@types/polls";
-import { Thread } from "matrix-js-sdk/src/models/thread";
 
 import { ActionPayload } from "../../dispatcher/payloads";
 import { AsyncStoreWithClient } from "../AsyncStoreWithClient";

src/stores/widgets/StopGapWidgetDriver.ts

@@ -41,9 +41,9 @@ import {
     MatrixEvent,
     Room,
     Direction,
+    THREAD_RELATION_TYPE,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 import {
     ApprovalOpts,
     CapabilitiesOpts,

src/utils/EventUtils.ts

@@ -22,12 +22,12 @@ import {
     MsgType,
     RelationType,
     MatrixClient,
+    THREAD_RELATION_TYPE,
 } from "matrix-js-sdk/src/matrix";
 import { logger } from "matrix-js-sdk/src/logger";
 import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 import { M_LOCATION } from "matrix-js-sdk/src/@types/location";
 import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 
 import shouldHideEvent from "../shouldHideEvent";
 import { GetRelationsForEvent } from "../components/views/rooms/EventTile";

src/utils/Reply.ts

@@ -15,10 +15,9 @@
  * limitations under the License.
  */
 
-import { IContent, IEventRelation, MatrixEvent, MsgType } from "matrix-js-sdk/src/matrix";
+import { IContent, IEventRelation, MatrixEvent, MsgType, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix";
 import sanitizeHtml from "sanitize-html";
 import escapeHtml from "escape-html";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 import { M_BEACON_INFO } from "matrix-js-sdk/src/@types/beacon";
 import { M_POLL_END, M_POLL_START } from "matrix-js-sdk/src/@types/polls";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";

src/utils/StorageManager.ts

@@ -14,9 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { LocalStorageCryptoStore } from "matrix-js-sdk/src/crypto/store/localStorage-crypto-store";
+import { LocalStorageCryptoStore, IndexedDBStore, IndexedDBCryptoStore } from "matrix-js-sdk/src/matrix";
-import { IndexedDBStore } from "matrix-js-sdk/src/store/indexeddb";
-import { IndexedDBCryptoStore } from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store";
 import { logger } from "matrix-js-sdk/src/logger";
 
 const localStorage = window.localStorage;

src/utils/createMatrixClient.ts

@@ -19,10 +19,10 @@ import {
     ICreateClientOpts,
     MemoryCryptoStore,
     MemoryStore,
+    IndexedDBCryptoStore,
+    IndexedDBStore,
+    LocalStorageCryptoStore,
 } from "matrix-js-sdk/src/matrix";
-import { IndexedDBCryptoStore } from "matrix-js-sdk/src/crypto/store/indexeddb-crypto-store";
-import { IndexedDBStore } from "matrix-js-sdk/src/store/indexeddb";
-import { LocalStorageCryptoStore } from "matrix-js-sdk/src/crypto/store/localStorage-crypto-store";
 
 // @ts-ignore - `.ts` is needed here to make TS happy
 import IndexedDBWorker from "../workers/indexeddb.worker.ts";

test/components/structures/MessagePanel-test.tsx

@@ -17,9 +17,8 @@ limitations under the License.
 
 import React from "react";
 import { EventEmitter } from "events";
-import { MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { MatrixEvent, Room, RoomMember, Thread } from "matrix-js-sdk/src/matrix";
 import { render } from "@testing-library/react";
-import { Thread } from "matrix-js-sdk/src/models/thread";
 import { ReceiptType } from "matrix-js-sdk/src/@types/read_receipts";
 
 import MessagePanel, { shouldFormContinuation } from "../../../src/components/structures/MessagePanel";

test/components/structures/ThreadPanel-test.tsx

@@ -18,8 +18,14 @@ import React from "react";
 import { render, screen, fireEvent, waitFor } from "@testing-library/react";
 import "focus-visible"; // to fix context menus
 import { mocked } from "jest-mock";
-import { MatrixClient, MatrixEvent, PendingEventOrdering, Room } from "matrix-js-sdk/src/matrix";
+import {
-import { FeatureSupport, Thread } from "matrix-js-sdk/src/models/thread";
+    MatrixClient,
+    MatrixEvent,
+    PendingEventOrdering,
+    Room,
+    FeatureSupport,
+    Thread,
+} from "matrix-js-sdk/src/matrix";
 
 import ThreadPanel, { ThreadFilterType, ThreadPanelHeader } from "../../../src/components/structures/ThreadPanel";
 import MatrixClientContext from "../../../src/contexts/MatrixClientContext";

test/components/structures/ThreadView-test.tsx

@@ -25,8 +25,8 @@ import {
     Room,
     MatrixClient,
     PendingEventOrdering,
+    THREAD_RELATION_TYPE,
 } from "matrix-js-sdk/src/matrix";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 import React, { useState } from "react";
 
 import ThreadView from "../../../src/components/structures/ThreadView";

test/components/structures/TimelinePanel-test.tsx

@@ -29,14 +29,12 @@ import {
     RoomState,
     TimelineWindow,
     EventTimeline,
-} from "matrix-js-sdk/src/matrix";
-import {
     FeatureSupport,
     Thread,
     THREAD_RELATION_TYPE,
     ThreadEvent,
     ThreadFilterType,
-} from "matrix-js-sdk/src/models/thread";
+} from "matrix-js-sdk/src/matrix";
 import React, { createRef } from "react";
 import { Mocked, mocked } from "jest-mock";
 import { forEachRight } from "lodash";

test/components/views/context_menus/MessageContextMenu-test.tsx

@@ -25,10 +25,11 @@ import {
     Beacon,
     getBeaconInfoIdentifier,
     EventType,
+    FeatureSupport,
+    Thread,
 } from "matrix-js-sdk/src/matrix";
 import { M_POLL_KIND_DISCLOSED } from "matrix-js-sdk/src/@types/polls";
 import { PollStartEvent } from "matrix-js-sdk/src/extensible_events_v1/PollStartEvent";
-import { FeatureSupport, Thread } from "matrix-js-sdk/src/models/thread";
 import { mocked } from "jest-mock";
 
 import { MatrixClientPeg } from "../../../../src/MatrixClientPeg";

test/components/views/messages/MessageActionBar-test.tsx

@@ -16,8 +16,16 @@ limitations under the License.
 
 import React from "react";
 import { act, render, fireEvent } from "@testing-library/react";
-import { EventType, EventStatus, MatrixEvent, MatrixEventEvent, MsgType, Room } from "matrix-js-sdk/src/matrix";
+import {
-import { FeatureSupport, Thread } from "matrix-js-sdk/src/models/thread";
+    EventType,
+    EventStatus,
+    MatrixEvent,
+    MatrixEventEvent,
+    MsgType,
+    Room,
+    FeatureSupport,
+    Thread,
+} from "matrix-js-sdk/src/matrix";
 
 import MessageActionBar from "../../../../src/components/views/messages/MessageActionBar";
 import {

test/components/views/rooms/MessageComposer-test.tsx

@@ -15,8 +15,7 @@ limitations under the License.
 */
 
 import * as React from "react";
-import { EventType, MatrixEvent, Room, RoomMember } from "matrix-js-sdk/src/matrix";
+import { EventType, MatrixEvent, Room, RoomMember, THREAD_RELATION_TYPE } from "matrix-js-sdk/src/matrix";
-import { THREAD_RELATION_TYPE } from "matrix-js-sdk/src/models/thread";
 import { act, render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 

test/components/views/rooms/RoomTile-test.tsx

@@ -17,9 +17,15 @@ limitations under the License.
 import React from "react";
 import { render, screen, act, RenderResult } from "@testing-library/react";
 import { mocked, Mocked } from "jest-mock";
-import { MatrixClient, PendingEventOrdering, Room, MatrixEvent, RoomStateEvent } from "matrix-js-sdk/src/matrix";
+import {
+    MatrixClient,
+    PendingEventOrdering,
+    Room,
+    MatrixEvent,
+    RoomStateEvent,
+    Thread,
+} from "matrix-js-sdk/src/matrix";
 import { Widget } from "matrix-widget-api";
-import { Thread } from "matrix-js-sdk/src/models/thread";
 
 import type { RoomMember } from "matrix-js-sdk/src/matrix";
 import type { ClientWidgetApi } from "matrix-widget-api";

test/test-utils/threads.ts

@@ -14,8 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import { MatrixClient, MatrixEvent, MatrixEventEvent, RelationType, Room } from "matrix-js-sdk/src/matrix";
+import { MatrixClient, MatrixEvent, MatrixEventEvent, RelationType, Room, Thread } from "matrix-js-sdk/src/matrix";
-import { Thread } from "matrix-js-sdk/src/models/thread";
 
 import { mkMessage, MessageEventProps } from "./test-utils";
 

test/utils/EventUtils-test.ts

@@ -25,8 +25,8 @@ import {
     PendingEventOrdering,
     RelationType,
     Room,
+    Thread,
 } from "matrix-js-sdk/src/matrix";
-import { Thread } from "matrix-js-sdk/src/models/thread";
 
 import { MatrixClientPeg } from "../../src/MatrixClientPeg";
 import {