From ac4642ec0462bb0b20c04768114164a6e78bc0c5 Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Mon, 30 May 2022 13:25:14 +0300 Subject: [PATCH] Make different MessageChannels not require explicit "extends JsonObject" Note: Non-escaped lint breaks type here for forcing interface over type. Reasonable effort brought no understanding for what is the relevant difference between the two. Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- .../application-update-status-channel.injectable.ts | 4 ++-- .../ask-boolean/ask-boolean-question-channel.injectable.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/application-update/application-update-status-channel.injectable.ts b/src/common/application-update/application-update-status-channel.injectable.ts index 251bc7e992..ef9b9ed14f 100644 --- a/src/common/application-update/application-update-status-channel.injectable.ts +++ b/src/common/application-update/application-update-status-channel.injectable.ts @@ -3,7 +3,6 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { JsonObject } from "type-fest"; import type { MessageChannel } from "../channel/message-channel-injection-token"; import { messageChannelInjectionToken } from "../channel/message-channel-injection-token"; @@ -13,7 +12,8 @@ export type ApplicationUpdateStatusEventId = | "download-for-update-started" | "download-for-update-failed"; -export interface ApplicationUpdateStatusChannelMessage extends JsonObject { eventId: ApplicationUpdateStatusEventId; version?: string } +// eslint-disable-next-line @typescript-eslint/consistent-type-definitions +export type ApplicationUpdateStatusChannelMessage = { eventId: ApplicationUpdateStatusEventId; version?: string }; export type ApplicationUpdateStatusChannel = MessageChannel; const applicationUpdateStatusChannelInjectable = getInjectable({ diff --git a/src/common/ask-boolean/ask-boolean-question-channel.injectable.ts b/src/common/ask-boolean/ask-boolean-question-channel.injectable.ts index 4027fa1513..bae41372dd 100644 --- a/src/common/ask-boolean/ask-boolean-question-channel.injectable.ts +++ b/src/common/ask-boolean/ask-boolean-question-channel.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { JsonObject } from "type-fest"; import type { MessageChannel } from "../channel/message-channel-injection-token"; import { messageChannelInjectionToken } from "../channel/message-channel-injection-token"; -export interface AskBooleanQuestionParameters extends JsonObject { id: string; title: string; question: string } +// eslint-disable-next-line @typescript-eslint/consistent-type-definitions +export type AskBooleanQuestionParameters = { id: string; title: string; question: string }; export type AskBooleanQuestionChannel = MessageChannel; const askBooleanQuestionChannelInjectable = getInjectable({