consolidate domain types in schemas, add baseSlice for loading/error, refactor uiSlice to use baseSlice

Author: rgilks

app/store/baseSlice.ts

@@ -0,0 +1,26 @@
+import type { StateCreator } from 'zustand';
+import type { Draft } from 'immer';
+
+export interface BaseSlice {
+  loading: boolean;
+  error: string | null;
+  setLoading: (loading: boolean) => void;
+  setError: (error: string | null) => void;
+}
+
+export const createBaseSlice = <T extends { loading: boolean; error: string | null }>(
+  set: Parameters<StateCreator<T, [['zustand/immer', never]], [], T>>[0]
+): BaseSlice => ({
+  loading: false,
+  error: null,
+  setLoading: (loading) => {
+    set((state: Draft<T>) => {
+      state.loading = loading;
+    });
+  },
+  setError: (error) => {
+    set((state: Draft<T>) => {
+      state.error = error;
+    });
+  },
+});

app/store/uiSlice.ts

@@ -1,15 +1,13 @@
 import type { StateCreator } from 'zustand';
 import type { TextGeneratorState } from './textGeneratorStore';
+import type { BaseSlice } from './baseSlice';
+import { createBaseSlice } from './baseSlice';
 
-export interface UISlice {
-  loading: boolean;
-  error: string | null;
+export interface UISlice extends BaseSlice {
   showLoginPrompt: boolean;
   showContent: boolean;
   showQuestionSection: boolean;
   showExplanation: boolean;
-  setError: (error: string | null) => void;
-  setLoading: (loading: boolean) => void;
   setShowLoginPrompt: (show: boolean) => void;
   setShowContent: (show: boolean) => void;
   setShowQuestionSection: (show: boolean) => void;
@@ -22,23 +20,12 @@ export const createUISlice: StateCreator<
   [],
   UISlice
 > = (set, _get) => ({
-  loading: false,
-  error: null,
+  ...createBaseSlice(set),
   showLoginPrompt: true,
   showContent: false,
   showQuestionSection: false,
   showExplanation: false,
 
-  setError: (error) => {
-    set((state) => {
-      state.error = error;
-    });
-  },
-  setLoading: (loading) => {
-    set((state) => {
-      state.loading = loading;
-    });
-  },
   setShowLoginPrompt: (show) => {
     set((state) => {
       state.showLoginPrompt = show;

lib/domain/exercise.types.ts

@@ -117,3 +117,32 @@ export const CEFRTopicsSchema = z.record(z.string(), z.array(TopicCategorySchema
 
 export type TopicCategory = z.infer<typeof TopicCategorySchema>;
 export type CEFRTopics = z.infer<typeof CEFRTopicsSchema>;
+
+// Exercise-related schemas (moved from exercise.types.ts)
+
+export const ExerciseOptionsSchema = z.object({
+  A: z.string(),
+  B: z.string(),
+  C: z.string(),
+  D: z.string(),
+});
+export type ExerciseOptions = z.infer<typeof ExerciseOptionsSchema>;
+
+export const ExerciseExplanationSchema = z.object({
+  A: z.string(),
+  B: z.string(),
+  C: z.string(),
+  D: z.string(),
+});
+export type ExerciseExplanation = z.infer<typeof ExerciseExplanationSchema>;
+
+export const GeneratedExerciseSchema = z.object({
+  paragraph: z.string(),
+  topic: z.string(),
+  question: z.string(),
+  options: ExerciseOptionsSchema,
+  correctAnswer: z.enum(['A', 'B', 'C', 'D']),
+  allExplanations: ExerciseExplanationSchema,
+  relevantText: z.string(),
+});
+export type GeneratedExercise = z.infer<typeof GeneratedExerciseSchema>;