Fixed generic selector types

#1197
deephaven · Apr 3, 2023 · bc48e7b · bc48e7b
1 parent e22e68d
commit bc48e7b
Showing 1 changed file with 21 additions and 19 deletions.
diff --git a/packages/redux/src/selectors.ts b/packages/redux/src/selectors.ts
@@ -1,4 +1,4 @@
-import type { RootState, Storage, WorkspaceSettings } from './store';
+import type { RootState } from './store';
 
 const EMPTY_OBJECT = Object.freeze({});
 
@@ -34,80 +34,82 @@ export const getFileStorage = <State extends RootState = RootState>(
 
 export const getWorkspaceStorage = <State extends RootState = RootState>(
   store: State
-): Storage['workspaceStorage'] => getStorage(store).workspaceStorage;
+): State['storage']['workspaceStorage'] => getStorage(store).workspaceStorage;
 
 // Workspace
 export const getWorkspace = <State extends RootState = RootState>(
   store: State
-): RootState['workspace'] => store.workspace;
+): State['workspace'] => store.workspace;
 
 // Settings
+type Settings<
+  State extends RootState = RootState
+> = State['workspace']['data']['settings'];
+
 export const getSettings = <State extends RootState = RootState>(
   store: State
-): RootState['workspace']['data']['settings'] =>
-  getWorkspace(store).data.settings;
+): Settings<State> => getWorkspace(store).data.settings;
 
 export const getDefaultDateTimeFormat = <State extends RootState = RootState>(
   store: State
-): WorkspaceSettings['defaultDateTimeFormat'] =>
+): Settings<State>['defaultDateTimeFormat'] =>
   getSettings(store).defaultDateTimeFormat;
 
 export const getDefaultDecimalFormatOptions = <
   State extends RootState = RootState
 >(
   store: State
-): WorkspaceSettings['defaultDecimalFormatOptions'] =>
+): Settings<State>['defaultDecimalFormatOptions'] =>
   getSettings(store).defaultDecimalFormatOptions ?? EMPTY_OBJECT;
 
 export const getDefaultIntegerFormatOptions = <
   State extends RootState = RootState
 >(
   store: State
-): WorkspaceSettings['defaultIntegerFormatOptions'] =>
+): Settings<State>['defaultIntegerFormatOptions'] =>
   getSettings(store).defaultIntegerFormatOptions ?? EMPTY_OBJECT;
 
 export const getFormatter = <State extends RootState = RootState>(
   store: State
-): WorkspaceSettings['formatter'] => getSettings(store).formatter;
+): Settings<State>['formatter'] => getSettings(store).formatter;
 
 export const getTimeZone = <State extends RootState = RootState>(
   store: State
-): WorkspaceSettings['timeZone'] => getSettings(store).timeZone;
+): Settings<State>['timeZone'] => getSettings(store).timeZone;
 
 export const getShowTimeZone = <State extends RootState = RootState>(
   store: State
-): WorkspaceSettings['showTimeZone'] => getSettings(store).showTimeZone;
+): Settings<State>['showTimeZone'] => getSettings(store).showTimeZone;
 
 export const getShowTSeparator = <State extends RootState = RootState>(
   store: State
-): WorkspaceSettings['showTSeparator'] => getSettings(store).showTSeparator;
+): Settings<State>['showTSeparator'] => getSettings(store).showTSeparator;
 
 export const getTruncateNumbersWithPound = <
   State extends RootState = RootState
 >(
   store: State
-): WorkspaceSettings['truncateNumbersWithPound'] =>
+): Settings<State>['truncateNumbersWithPound'] =>
   getSettings(store).truncateNumbersWithPound;
 
 export const getDisableMoveConfirmation = <State extends RootState = RootState>(
   store: State
-): WorkspaceSettings['disableMoveConfirmation'] =>
+): Settings<State>['disableMoveConfirmation'] =>
   getSettings(store).disableMoveConfirmation || false;
 
 export const getShortcutOverrides = <State extends RootState = RootState>(
   store: State
-): WorkspaceSettings['shortcutOverrides'] =>
-  getSettings(store).shortcutOverrides;
+): Settings<State>['shortcutOverrides'] => getSettings(store).shortcutOverrides;
 
 export const getDefaultNotebookSettings = <State extends RootState = RootState>(
   store: State
-): WorkspaceSettings['defaultNotebookSettings'] =>
+): Settings<State>['defaultNotebookSettings'] =>
   getSettings(store).defaultNotebookSettings ?? EMPTY_OBJECT;
 
 export const getActiveTool = <State extends RootState = RootState>(
   store: State
-): RootState['activeTool'] => store.activeTool;
+): State['activeTool'] => store.activeTool;
 
 export const getPlugins = <State extends RootState = RootState>(
   store: State
-): RootState['plugins'] => store.plugins ?? EMPTY_MAP;
+): State['plugins'] => store.plugins ?? EMPTY_MAP;