Skip to content

Commit 1af2383

Browse files
committed
lint:fix
1 parent d145f62 commit 1af2383

File tree

2 files changed

+19
-32
lines changed

2 files changed

+19
-32
lines changed

packages/announcement-controller/src/AnnouncementController.test.ts

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@ import {
99

1010
const name = 'AnnouncementController';
1111

12-
/**
13-
* Constructs a unrestricted controller messenger.
14-
*
15-
* @returns A unrestricted controller messenger.
16-
*/
17-
function getUnrestrictedMessenger() {
18-
return new ControllerMessenger<
19-
AnnouncementControllerActions,
20-
AnnouncementControllerEvents
21-
>();
22-
}
23-
2412
/**
2513
* Constructs a restricted controller messenger.
2614
*
@@ -31,14 +19,9 @@ function getRestrictedMessenger() {
3119
AnnouncementControllerActions,
3220
AnnouncementControllerEvents
3321
>();
34-
return controllerMessenger.getRestricted<
35-
typeof name,
36-
never,
37-
never
38-
>(
39-
{
40-
name,
41-
});
22+
return controllerMessenger.getRestricted<typeof name, never, never>({
23+
name,
24+
});
4225
}
4326
const allAnnouncements = {
4427
1: {
@@ -66,7 +49,7 @@ const allAnnouncements2 = {
6649
3: {
6750
id: 3,
6851
date: '12/8/2020',
69-
isShown: false
52+
isShown: false,
7053
},
7154
};
7255
const state1: AnnouncementControllerState = {
@@ -109,9 +92,9 @@ describe('announcement controller', () => {
10992
const controller = new AnnouncementController({
11093
messenger: getRestrictedMessenger(),
11194
state: state1,
112-
allAnnouncements: allAnnouncements
95+
allAnnouncements,
11396
});
114-
expect(Object.keys(controller.state.announcements)).toHaveLength(2)
97+
expect(Object.keys(controller.state.announcements)).toHaveLength(2);
11598
const expectedStateNotifications: StateAnnouncementMap = {
11699
1: {
117100
...allAnnouncements[1],
@@ -129,7 +112,7 @@ describe('announcement controller', () => {
129112
const controller = new AnnouncementController({
130113
messenger: getRestrictedMessenger(),
131114
state: state2,
132-
allAnnouncements: allAnnouncements
115+
allAnnouncements,
133116
});
134117
expect(Object.keys(controller.state.announcements)).toHaveLength(3);
135118
expect(controller.state.announcements[1].isShown).toBe(true);
@@ -142,7 +125,7 @@ describe('announcement controller', () => {
142125
const controller = new AnnouncementController({
143126
messenger: getRestrictedMessenger(),
144127
state: state2,
145-
allAnnouncements: allAnnouncements2
128+
allAnnouncements: allAnnouncements2,
146129
});
147130
controller.updateViewed({ 1: true });
148131
expect(controller.state.announcements[1].isShown).toBe(true);
@@ -154,7 +137,7 @@ describe('announcement controller', () => {
154137
const controller = new AnnouncementController({
155138
messenger: getRestrictedMessenger(),
156139
state: state2,
157-
allAnnouncements: allAnnouncements2
140+
allAnnouncements: allAnnouncements2,
158141
});
159142
controller.updateViewed({ 2: true, 3: true });
160143
expect(controller.state.announcements[1].isShown).toBe(false);

packages/announcement-controller/src/AnnouncementController.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ export type AnnouncementControllerState = {
3030
announcements: StateAnnouncementMap;
3131
};
3232

33-
export type AnnouncementControllerActions = AnnouncementControllerGetStateAction;
34-
export type AnnouncementControllerEvents = AnnouncementControllerStateChangeEvent;
33+
export type AnnouncementControllerActions =
34+
AnnouncementControllerGetStateAction;
35+
export type AnnouncementControllerEvents =
36+
AnnouncementControllerStateChangeEvent;
3537

3638
export type AnnouncementControllerGetStateAction = {
3739
type: `${typeof controllerName}:getState`;
@@ -79,12 +81,12 @@ export class AnnouncementController extends BaseControllerV2<
7981
* @param args - The arguments to this function.
8082
* @param args.messenger - Messenger used to communicate with BaseV2 controller.
8183
* @param args.state - Initial state to set on this controller.
82-
* @param args.allAnnouncements
84+
* @param args.allAnnouncements - Announcements to be passed through to #addAnnouncements
8385
*/
8486
constructor({
8587
messenger,
8688
state,
87-
allAnnouncements
89+
allAnnouncements,
8890
}: {
8991
messenger: AnnouncementControllerMessenger;
9092
state?: AnnouncementControllerState;
@@ -107,8 +109,10 @@ export class AnnouncementController extends BaseControllerV2<
107109
this.update(({ announcements }) => {
108110
Object.values(allAnnouncements).forEach(
109111
(announcement: StateAnnouncement) => {
110-
announcements[announcement.id] = allAnnouncements[announcement.id] ?? announcement;
111-
});
112+
announcements[announcement.id] =
113+
allAnnouncements[announcement.id] ?? announcement;
114+
},
115+
);
112116
});
113117
}
114118

0 commit comments

Comments
 (0)