From 14d335a98480423db80b1c3bf6cad167c22b14cb Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 13 Jun 2022 14:49:38 -0400 Subject: [PATCH] Fix typing Signed-off-by: Sebastian Malton --- .../sync-box/create-sync-box.injectable.ts | 6 +++--- .../utils/sync-box/sync-box-injection-token.ts | 17 +++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/src/common/utils/sync-box/create-sync-box.injectable.ts b/src/common/utils/sync-box/create-sync-box.injectable.ts index 28a0ec3ccb..1328106e24 100644 --- a/src/common/utils/sync-box/create-sync-box.injectable.ts +++ b/src/common/utils/sync-box/create-sync-box.injectable.ts @@ -8,7 +8,7 @@ import { computed } from "mobx"; import syncBoxChannelInjectable from "./sync-box-channel.injectable"; import { messageToChannelInjectionToken } from "../channel/message-to-channel-injection-token"; import syncBoxStateInjectable from "./sync-box-state.injectable"; -import type { AsJson, SyncBox } from "./sync-box-injection-token"; +import type { SyncBox } from "./sync-box-injection-token"; const createSyncBoxInjectable = getInjectable({ id: "create-sync-box", @@ -18,8 +18,8 @@ const createSyncBoxInjectable = getInjectable({ const messageToChannel = di.inject(messageToChannelInjectionToken); const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id); - return (id: string, initialValue: AsJson): SyncBox => { - const state = getSyncBoxState(id) as IObservableValue>; + return (id: string, initialValue: Value): SyncBox => { + const state = getSyncBoxState(id) as IObservableValue; state.set(initialValue); diff --git a/src/common/utils/sync-box/sync-box-injection-token.ts b/src/common/utils/sync-box/sync-box-injection-token.ts index 347e4d85fa..8db80243d3 100644 --- a/src/common/utils/sync-box/sync-box-injection-token.ts +++ b/src/common/utils/sync-box/sync-box-injection-token.ts @@ -4,21 +4,10 @@ */ import { getInjectionToken } from "@ogre-tools/injectable"; import type { IComputedValue } from "mobx"; - -export type AsJson = T extends string | number | boolean | null - ? T - : T extends Function - ? never - : T extends Array - ? AsJson[] - : T extends object - ? { [K in keyof T]: AsJson } - : never; - -export interface SyncBox { +export interface SyncBox { id: string; - value: IComputedValue>; - set: (value: AsJson) => void; + value: IComputedValue; + set: (value: Value) => void; } export const syncBoxInjectionToken = getInjectionToken>({