Fix broken tsc

Author: leeyi45

src/commons/sagas/PlaygroundSaga.ts

@@ -19,7 +19,6 @@ import { SideContentType } from '../sideContent/SideContentTypes';
 import Constants from '../utils/Constants';
 import { showSuccessMessage, showWarningMessage } from '../utils/notifications/NotificationsHelper';
 import WorkspaceActions from '../workspace/WorkspaceActions';
-import type { PlaygroundWorkspaceState } from '../workspace/WorkspaceTypes';
 import { safeTakeEvery as takeEvery, selectWorkspace } from './SafeEffects';
 
 export default function* PlaygroundSaga(): SagaIterator {
@@ -77,9 +76,7 @@ export default function* PlaygroundSaga(): SagaIterator {
       const {
         context: { chapter: playgroundSourceChapter },
         editorTabs
-      }: PlaygroundWorkspaceState = yield select(
-        (state: OverallState) => state.workspaces[workspaceLocation]
-      );
+      } = yield* selectWorkspace('playground');
 
       if (prevId === SideContentType.substVisualizer) {
         if (newId === SideContentType.mobileEditorRun) return;

src/commons/sagas/SafeEffects.ts

@@ -5,6 +5,7 @@ import {
   type ForkEffect,
   type HelperWorkerParameters,
   select,
+  SelectEffect,
   takeEvery,
   takeLatest,
   takeLeading
@@ -101,10 +102,22 @@ export function safeTakeLeading<P extends ActionPattern, Fn extends (...args: an
   return takeLeading<P, typeof wrappedWorker>(pattern, wrappedWorker, ...args);
 }
 
-export function* selectWorkspace<T extends WorkspaceLocation>(workspaceLocation: T) {
+export function selectWorkspace<T extends WorkspaceLocation, U>(
+  workspaceLocation: T,
+  func: (state: WorkspaceManagerState[T]) => U
+): Generator<SelectEffect, U>;
+export function selectWorkspace<T extends WorkspaceLocation>(
+  workspaceLocation: T
+): Generator<SelectEffect, WorkspaceManagerState[T]>;
+export function* selectWorkspace<T extends WorkspaceLocation, U>(
+  workspaceLocation: T,
+  f?: (state: WorkspaceManagerState[T]) => U
+) {
   const workspace: WorkspaceManagerState[T] = yield select(
     (state: OverallState) => state.workspaces[workspaceLocation]
   );
+
+  if (f) return f(workspace);
   return workspace;
 }
 

src/commons/sagas/__tests__/WorkspaceSaga.ts

@@ -289,8 +289,8 @@ describe('DEBUG_RESUME', () => {
       editorValueFilePath,
       context,
       execTime,
-      workspaceLocation,
-      WorkspaceActions.evalEditor.type
+      WorkspaceActions.evalEditor.type,
+      workspaceLocation
     )
       .withState(state)
       .silentRun();
@@ -826,8 +826,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .provide([
@@ -855,8 +855,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .provide([
@@ -885,8 +885,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .provide([
@@ -922,8 +922,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .call(runFilesInContext, files, codeFilePath, context, {
@@ -948,8 +948,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        WorkspaceActions.evalEditor.type
+        WorkspaceActions.evalEditor.type,
+        workspaceLocation
       )
         .withState(state)
         .silentRun();
@@ -964,8 +964,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .provide([[call(resume, lastDebuggerResult), { status: 'finished', value }]])
@@ -983,8 +983,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .provide([[call(resume, lastDebuggerResult), { status: 'suspended-cse-eval' }]])
@@ -1003,8 +1003,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .call(resume, lastDebuggerResult)
@@ -1021,8 +1021,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .provide({
@@ -1051,8 +1051,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .provide({
@@ -1080,8 +1080,8 @@ describe('evalCode', () => {
         codeFilePath,
         context,
         execTime,
-        workspaceLocation,
-        actionType
+        actionType,
+        workspaceLocation
       )
         .withState(state)
         .provide([