Merge branch 'develop' into renovate/matrix-org

Author: t3chguy

.eslintrc.cjs

@@ -112,8 +112,13 @@ module.exports = {
                 "@typescript-eslint/ban-ts-comment": "off",
                 // We're okay with assertion errors when we ask for them
                 "@typescript-eslint/no-non-null-assertion": "off",
-                // We do this sometimes to brand interfaces
-                "@typescript-eslint/no-empty-object-type": "off",
+                "@typescript-eslint/no-empty-object-type": [
+                    "error",
+                    {
+                        // We do this sometimes to brand interfaces
+                        allowInterfaces: "with-single-extends",
+                    },
+                ],
 
                 "quotes": "off",
                 // We use a `logger` intermediary module
@@ -147,6 +152,7 @@ module.exports = {
                 // We don't need super strict typing in test utilities
                 "@typescript-eslint/explicit-function-return-type": "off",
                 "@typescript-eslint/explicit-member-accessibility": "off",
+                "@typescript-eslint/no-empty-object-type": "off",
             },
         },
     ],

.github/workflows/sonarcloud.yml

@@ -27,7 +27,7 @@ jobs:
         steps:
             # We create the status here and then update it to success/failure in the `report` stage
             # This provides an easy link to this workflow_run from the PR before Sonarcloud is done.
-            - uses: guibranco/github-status-action-v2@ecd54a02cf761e85a8fb328fe937710fd4227cda
+            - uses: guibranco/github-status-action-v2@119b3320db3f04d89e91df840844b92d57ce3468
               with:
                   authToken: ${{ secrets.GITHUB_TOKEN }}
                   state: pending
@@ -87,7 +87,7 @@ jobs:
                   revision: ${{ github.event.workflow_run.head_sha }}
                   token: ${{ secrets.SONAR_TOKEN }}
 
-            - uses: guibranco/github-status-action-v2@ecd54a02cf761e85a8fb328fe937710fd4227cda
+            - uses: guibranco/github-status-action-v2@119b3320db3f04d89e91df840844b92d57ce3468
               if: always()
               with:
                   authToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/tests.yml

@@ -116,7 +116,7 @@ jobs:
         steps:
             - name: Skip SonarCloud on merge queues
               if: env.ENABLE_COVERAGE == 'false'
-              uses: guibranco/github-status-action-v2@ecd54a02cf761e85a8fb328fe937710fd4227cda
+              uses: guibranco/github-status-action-v2@119b3320db3f04d89e91df840844b92d57ce3468
               with:
                   authToken: ${{ secrets.GITHUB_TOKEN }}
                   state: success

package.json

@@ -81,7 +81,7 @@
         "@babel/preset-typescript": "^7.12.7",
         "@casualbot/jest-sonar-reporter": "2.2.7",
         "@peculiar/webcrypto": "^1.4.5",
-        "@stylistic/eslint-plugin": "^2.9.0",
+        "@stylistic/eslint-plugin": "^3.0.0",
         "@types/bs58": "^4.0.1",
         "@types/content-type": "^1.1.5",
         "@types/debug": "^4.1.7",
@@ -96,7 +96,7 @@
         "debug": "^4.3.4",
         "eslint": "8.57.1",
         "eslint-config-google": "^0.14.0",
-        "eslint-config-prettier": "^9.0.0",
+        "eslint-config-prettier": "^10.0.0",
         "eslint-import-resolver-typescript": "^3.5.1",
         "eslint-plugin-import": "^2.26.0",
         "eslint-plugin-jest": "^28.0.0",

spec/test-utils/webrtc.ts

@@ -17,6 +17,7 @@ limitations under the License.
 import {
     ClientEvent,
     ClientEventHandlerMap,
+    EmptyObject,
     EventType,
     GroupCall,
     GroupCallIntent,
@@ -466,7 +467,7 @@ export class MockCallMatrixClient extends TypedEventEmitter<EmittedEvents, Emitt
         [roomId: string, eventType: EventType, content: any, statekey: string]
     >();
     public sendToDevice = jest.fn<
-        Promise<{}>,
+        Promise<EmptyObject>,
         [eventType: string, contentMap: SendToDeviceContentMap, txnId?: string]
     >();
 

spec/unit/rust-crypto/rust-crypto.spec.ts

@@ -33,6 +33,7 @@ import {
     AccountDataEvents,
     Device,
     DeviceVerification,
+    EmptyObject,
     encodeBase64,
     HttpApiEvent,
     HttpApiEventHandlerMap,
@@ -2348,7 +2349,7 @@ class DummyAccountDataClient
         }
     }
 
-    public async setAccountData(eventType: string, content: any): Promise<{}> {
+    public async setAccountData(eventType: string, content: any): Promise<EmptyObject> {
         this.storage.set(eventType, content);
         this.emit(
             ClientEvent.AccountData,

src/@types/common.ts

@@ -20,3 +20,5 @@ export type NonEmptyArray<T> = [T, ...T[]];
 export type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
 export type XOR<T, U> = T | U extends object ? (Without<T, U> & U) | (Without<U, T> & T) : T | U;
 export type Writeable<T> = { -readonly [P in keyof T]: T[P] };
+
+export type EmptyObject = Record<PropertyKey, never>;

src/@types/event.ts

@@ -38,7 +38,7 @@ import {
 import { IGroupCallRoomMemberState, IGroupCallRoomState } from "../webrtc/groupCall.ts";
 import { MSC3089EventContent } from "../models/MSC3089Branch.ts";
 import { M_BEACON, M_BEACON_INFO, MBeaconEventContent, MBeaconInfoEventContent } from "./beacon.ts";
-import { XOR } from "./common.ts";
+import { EmptyObject } from "./common.ts";
 import { ReactionEventContent, RoomMessageEventContent, StickerEventContent } from "./events.ts";
 import {
     MCallAnswer,
@@ -337,7 +337,7 @@ export interface StateEvents {
     [EventType.RoomJoinRules]: RoomJoinRulesEventContent;
     [EventType.RoomMember]: RoomMemberEventContent;
     // XXX: Spec says this event has 3 required fields but kicking such an invitation requires sending `{}`
-    [EventType.RoomThirdPartyInvite]: XOR<RoomThirdPartyInviteEventContent, {}>;
+    [EventType.RoomThirdPartyInvite]: RoomThirdPartyInviteEventContent | EmptyObject;
     [EventType.RoomPowerLevels]: RoomPowerLevelsEventContent;
     [EventType.RoomName]: RoomNameEventContent;
     [EventType.RoomTopic]: RoomTopicEventContent;
@@ -351,13 +351,13 @@ export interface StateEvents {
     [EventType.SpaceChild]: SpaceChildEventContent;
     [EventType.SpaceParent]: SpaceParentEventContent;
 
-    [EventType.PolicyRuleUser]: XOR<PolicyRuleEventContent, {}>;
-    [EventType.PolicyRuleRoom]: XOR<PolicyRuleEventContent, {}>;
-    [EventType.PolicyRuleServer]: XOR<PolicyRuleEventContent, {}>;
+    [EventType.PolicyRuleUser]: PolicyRuleEventContent | EmptyObject;
+    [EventType.PolicyRuleRoom]: PolicyRuleEventContent | EmptyObject;
+    [EventType.PolicyRuleServer]: PolicyRuleEventContent | EmptyObject;
 
     // MSC3401
     [EventType.GroupCallPrefix]: IGroupCallRoomState;
-    [EventType.GroupCallMemberPrefix]: XOR<IGroupCallRoomMemberState, XOR<SessionMembershipData, {}>>;
+    [EventType.GroupCallMemberPrefix]: IGroupCallRoomMemberState | SessionMembershipData | EmptyObject;
 
     // MSC3089
     [UNSTABLE_MSC3089_BRANCH.name]: MSC3089EventContent;
@@ -372,7 +372,7 @@ export interface StateEvents {
 export interface AccountDataEvents extends SecretStorageAccountDataEvents {
     [EventType.PushRules]: IPushRules;
     [EventType.Direct]: { [userId: string]: string[] };
-    [EventType.IgnoredUserList]: { [userId: string]: {} };
+    [EventType.IgnoredUserList]: { ignored_users: { [userId: string]: EmptyObject } };
     "m.secret_storage.default_key": { key: string };
     // Flag set by the rust SDK (Element X) and also used by us to mark that the user opted out of backup
     // (I don't know why it's m.org.matrix...)

src/@types/extensible_events.ts

@@ -97,12 +97,12 @@ export type AnyRelation = TSNamespace<typeof REFERENCE_RELATION> | string;
 /**
  * An m.relates_to relationship
  */
-export type RelatesToRelationship<R = never, C = never> = {
+export type RelatesToRelationship<R = never> = {
     "m.relates_to": {
         // See https://github.com/microsoft/TypeScript/issues/23182#issuecomment-379091887 for array syntax
         rel_type: [R] extends [never] ? AnyRelation : TSNamespace<R>;
         event_id: string;
-    } & DefaultNever<C, {}>;
+    };
 };
 
 /**

src/@types/global.d.ts

@@ -60,6 +60,7 @@ declare global {
               };
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-empty-object-type
     interface DummyInterfaceWeShouldntBeUsingThis {}
 
     interface Navigator {

src/@types/polls.ts

@@ -22,6 +22,7 @@ import {
     RelatesToRelationship,
     TSNamespace,
 } from "./extensible_events.ts";
+import { EmptyObject } from "./common.ts";
 
 /**
  * Identifier for a disclosed poll.
@@ -109,7 +110,7 @@ export const M_POLL_END = new UnstableValue("m.poll.end", "org.matrix.msc3381.po
 /**
  * The event definition for an m.poll.end event (in content)
  */
-export type PollEndEvent = EitherAnd<{ [M_POLL_END.name]: {} }, { [M_POLL_END.altName]: {} }>;
+export type PollEndEvent = EitherAnd<{ [M_POLL_END.name]: EmptyObject }, { [M_POLL_END.altName]: EmptyObject }>;
 
 /**
  * The content for an m.poll.end event