refactor: standardise apps

goosewobbler · Dec 8, 2024 · 7afdece · 7afdece
1 parent 2aa4c44
commit 7afdece
Show file tree

Hide file tree

Showing 15 changed files with 63 additions and 58 deletions.
diff --git a/apps/example-reducers/src/features/index.ts b/apps/example-reducers/src/features/index.ts
@@ -2,16 +2,8 @@ import type { Reducer } from 'zutron';
 
 import { counterReducer } from './counter/index.js';
 
-export const rootReducer: Reducer<State> = (state, action) => ({
+export type AppState = { counter: number };
+
+export const rootReducer: Reducer<AppState> = (state, action) => ({
   counter: counterReducer(state.counter, action),
 });
-
-export type Subscribe = (listener: (state: State, prevState: State) => void) => () => void;
-export type Handlers = Record<string, () => void>;
-export type State = { counter: number };
-export type Store = {
-  getState: () => State;
-  getInitialState: () => State;
-  setState: (stateSetter: (state: State) => State) => void;
-  subscribe: Subscribe;
-};
diff --git a/apps/example-reducers/src/main/store.ts b/apps/example-reducers/src/main/store.ts
@@ -1,7 +1,18 @@
 import { createStore } from 'zustand/vanilla';
 
-import type { State } from '../features/index.js';
+import type { AppState } from '../features/index.js';
 
-export const store = createStore<State>()(() => ({
+type Subscribe = (listener: (state: AppState, prevState: AppState) => void) => () => void;
+
+export type Store = {
+  getState: () => AppState;
+  getInitialState: () => AppState;
+  setState: (stateSetter: (state: AppState) => AppState) => void;
+  subscribe: Subscribe;
+};
+
+const initialState: AppState = {
   counter: 0,
-}));
+};
+
+export const store = createStore<AppState>()(() => initialState);
diff --git a/apps/example-reducers/src/main/tray/index.ts b/apps/example-reducers/src/main/tray/index.ts
@@ -1,8 +1,10 @@
 import { type BrowserWindow, Menu, Tray, app, nativeImage } from 'electron';
 import { createDispatch } from 'zutron/main';
+
 import trayIconFile from '../../../../../resources/trayIcon.png';
 
-import { rootReducer, type State, type Store } from '../../features/index.js';
+import type { Store } from '../store.js';
+import { rootReducer, type AppState } from '../../features/index.js';
 
 const trayIcon = nativeImage.createFromDataURL(trayIconFile).resize({
   width: 18,
@@ -14,7 +16,7 @@ class SystemTray {
   private electronTray?: Tray;
   private window?: BrowserWindow;
 
-  private update = (state: State) => {
+  private update = (state: AppState) => {
     if (!this.dispatch) {
       return;
     }
@@ -57,7 +59,7 @@ class SystemTray {
 
   public init = (store: Store, window: BrowserWindow) => {
     this.window = window;
-    this.dispatch = createDispatch<State, Store>(store, { reducer: rootReducer });
+    this.dispatch = createDispatch<AppState, Store>(store, { reducer: rootReducer });
     this.update(store.getState());
     store.subscribe(() => this.update(store.getState()));
   };

diff --git a/apps/example-reducers/src/preload/index.ts b/apps/example-reducers/src/preload/index.ts
@@ -4,14 +4,14 @@ import { preloadZustandBridge } from 'zutron/preload';
 import 'wdio-electron-service/preload';
 import type { Handlers } from 'zutron';
 
-import type { State } from '../features/index.js';
+import type { AppState } from '../features/index.js';
 
-export const { handlers } = preloadZustandBridge<State>();
+export const { handlers } = preloadZustandBridge<AppState>();
 
 contextBridge.exposeInMainWorld('zutron', handlers);
 
 declare global {
   interface Window {
-    zutron: Handlers<State>;
+    zutron: Handlers<AppState>;
   }
 }
diff --git a/apps/example-reducers/src/renderer/App.tsx b/apps/example-reducers/src/renderer/App.tsx
@@ -1,10 +1,10 @@
 import { useDispatch } from 'zutron';
 
 import { useStore } from './hooks/useStore.js';
-import type { State } from '../features/index.js';
+import type { AppState } from '../features/index.js';
 
 export const App = () => {
-  const counter = useStore((x: State) => x.counter);
+  const counter = useStore((x: AppState) => x.counter);
   const dispatch = useDispatch(window.zutron);
 
   return (

diff --git a/apps/example-reducers/src/renderer/hooks/useStore.ts b/apps/example-reducers/src/renderer/hooks/useStore.ts
@@ -1,4 +1,5 @@
 import { createUseStore } from 'zutron';
-import type { State } from '../../features/index.js';
 
-export const useStore = createUseStore<State>(window.zutron);
+import type { AppState } from '../../features/index.js';
+
+export const useStore = createUseStore<AppState>(window.zutron);
diff --git a/apps/example-separate-handlers/src/features/counter/index.ts b/apps/example-separate-handlers/src/features/counter/index.ts
@@ -1,4 +1,4 @@
-import { type Store } from '..';
+import type { Store } from '../../main/store.js';
 
 export const handlers = (store: Store) => ({
   'COUNTER:INCREMENT': () => store.setState((state) => ({ counter: state.counter + 1 })),

diff --git a/apps/example-separate-handlers/src/features/index.ts b/apps/example-separate-handlers/src/features/index.ts
@@ -1,16 +1,10 @@
 import { handlers as counterHandlers } from './counter/index.js';
+import type { Store } from '../main/store.js';
 
-export const actionHandlers = (store: Store, initialState: State) => ({
+export type Handlers = Record<string, () => void>;
+export type AppState = { counter: number };
+
+export const actionHandlers = (store: Store, initialState: AppState) => ({
   ...counterHandlers(store),
   'STORE:RESET': () => store.setState(() => initialState),
 });
-
-export type Subscribe = (listener: (state: State, prevState: State) => void) => () => void;
-export type Handlers = Record<string, () => void>;
-export type State = { counter: number };
-export type Store = {
-  getState: () => State;
-  getInitialState: () => State;
-  setState: (stateSetter: (state: State) => State) => void;
-  subscribe: Subscribe;
-};
diff --git a/apps/example-separate-handlers/src/main/store.ts b/apps/example-separate-handlers/src/main/store.ts
@@ -1,9 +1,18 @@
 import { createStore } from 'zustand/vanilla';
 
-import type { State } from '../features/index.js';
+import type { AppState } from '../features/index.js';
 
-export const initialState = {
+type Subscribe = (listener: (state: AppState, prevState: AppState) => void) => () => void;
+
+export type Store = {
+  getState: () => AppState;
+  getInitialState: () => AppState;
+  setState: (stateSetter: (state: AppState) => AppState) => void;
+  subscribe: Subscribe;
+};
+
+export const initialState: AppState = {
   counter: 0,
 };
 
-export const store = createStore<State>()(() => initialState);
+export const store = createStore<AppState>()(() => initialState);
diff --git a/apps/example-separate-handlers/src/main/tray/index.ts b/apps/example-separate-handlers/src/main/tray/index.ts
@@ -1,8 +1,10 @@
 import { type BrowserWindow, Menu, Tray, app, nativeImage } from 'electron';
 import { createDispatch } from 'zutron/main';
+
 import trayIconFile from '../../../../../resources/trayIcon.png';
 
-import type { Handlers, State, Store } from '../../features/index.js';
+import type { Store } from '../store.js';
+import type { Handlers, AppState } from '../../features/index.js';
 
 const trayIcon = nativeImage.createFromDataURL(trayIconFile).resize({
   width: 18,
@@ -14,7 +16,7 @@ class SystemTray {
   private electronTray?: Tray;
   private window?: BrowserWindow;
 
-  private update = (state: State) => {
+  private update = (state: AppState) => {
     if (!this.dispatch) {
       return;
     }
@@ -57,7 +59,7 @@ class SystemTray {
 
   public init = (store: Store, window: BrowserWindow, actionHandlers: Handlers) => {
     this.window = window;
-    this.dispatch = createDispatch<State, Store>(store, { handlers: actionHandlers });
+    this.dispatch = createDispatch<AppState, Store>(store, { handlers: actionHandlers });
     this.update(store.getState());
     store.subscribe(() => this.update(store.getState()));
   };

diff --git a/apps/example-separate-handlers/src/preload/index.ts b/apps/example-separate-handlers/src/preload/index.ts
@@ -3,14 +3,14 @@ import { preloadZustandBridge } from 'zutron/preload';
 import 'wdio-electron-service/preload';
 import type { Handlers } from 'zutron';
 
-import type { State } from '../features/index.js';
+import type { AppState } from '../features/index.js';
 
-export const { handlers } = preloadZustandBridge<State>();
+export const { handlers } = preloadZustandBridge<AppState>();
 
 contextBridge.exposeInMainWorld('zutron', handlers);
 
 declare global {
   interface Window {
-    zutron: Handlers<State>;
+    zutron: Handlers<AppState>;
   }
 }
diff --git a/apps/example-separate-handlers/src/renderer/App.tsx b/apps/example-separate-handlers/src/renderer/App.tsx
@@ -1,10 +1,10 @@
 import { useDispatch } from 'zutron';
 
 import { useStore } from './hooks/useStore.js';
-import type { State } from '../features/index.js';
+import type { AppState } from '../features/index.js';
 
 export const App = () => {
-  const counter = useStore((x: State) => x.counter);
+  const counter = useStore((x: AppState) => x.counter);
   const dispatch = useDispatch(window.zutron);
 
   return (

diff --git a/apps/example-separate-handlers/src/renderer/hooks/useStore.ts b/apps/example-separate-handlers/src/renderer/hooks/useStore.ts
@@ -1,4 +1,5 @@
 import { createUseStore } from 'zutron';
-import type { State } from '../../features/index.js';
 
-export const useStore = createUseStore<State>(window.zutron);
+import type { AppState } from '../../features/index.js';
+
+export const useStore = createUseStore<AppState>(window.zutron);
diff --git a/apps/example-store-handlers/src/features/counter/index.ts b/apps/example-store-handlers/src/features/counter/index.ts
@@ -1,4 +1,4 @@
-import type { Store } from '../index.js';
+import type { Store } from '../../main/store.js';
 
 export const handlers = (setState: Store['setState']) => ({
   'COUNTER:INCREMENT': () => setState((state) => ({ counter: state.counter + 1 })),

diff --git a/apps/example-store-handlers/src/features/index.ts b/apps/example-store-handlers/src/features/index.ts
@@ -1,14 +1,7 @@
 import { handlers as counterHandlers } from './counter/index.js';
+import type { Store } from '../main/store.js';
 
-export type Subscribe = (listener: (state: AppState, prevState: AppState) => void) => () => void;
-export type Handlers = Record<string, () => void>;
 export type AppState = { counter: number };
-export type Store = {
-  getState: () => AppState;
-  getInitialState: () => AppState;
-  setState: (stateSetter: (state: AppState) => AppState) => void;
-  subscribe: Subscribe;
-};
 
 export const actionHandlers = (setState: Store['setState'], initialState: AppState) => ({
   ...counterHandlers(setState),