Merge branch 'master' into java-slang-frontend

Author: martin-henz

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ env:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
-  
+
 jobs:
   lint:
     if: github.event.pull_request.draft == false

CONTRIBUTING.md

@@ -16,7 +16,7 @@ To start contributing, create a fork from our repo and send a PR. Refer to [this
 
 The frontend comes with an extensive test suite. To run the tests after you made your modifications, run
 `yarn test`. Regression tests are run automatically when you want to push changes to this repository.
-The regression tests are generated using `jest` and stored as snapshots in `src/\_\_tests\_\_`.  After modifying the frontend, carefully inspect any failing regression tests reported in red in the command line. If you are convinced that the regression tests and not your changes are at fault, you can update the regression tests by running:
+The regression tests are generated using `jest` and stored as snapshots in `src/\_\_tests\_\_`. After modifying the frontend, carefully inspect any failing regression tests reported in red in the command line. If you are convinced that the regression tests and not your changes are at fault, you can update the regression tests by running:
 
 ```bash
 yarn test --updateSnapshot

README.md

@@ -24,7 +24,7 @@ The Source Academy (<https://sourceacademy.org/>) is an immersive online experie
 
 1. Clone this repository and navigate to it using your command line
 
-1. Install the version of `yarn` as specified in `package.json`, `packageManager`. 
+1. Install the version of `yarn` as specified in `package.json`, `packageManager`.
 
    > We recommend using `corepack` to manage the version of `yarn`, you may simply run `corepack enable` to complete this step.
 

_config.yml

@@ -1 +1 @@
-theme: jekyll-theme-cayman
+theme: jekyll-theme-cayman

eslint.config.mjs

@@ -4,7 +4,7 @@
 import { config, configs } from 'typescript-eslint';
 import reactPlugin from 'eslint-plugin-react';
 import reactHooksPlugin from 'eslint-plugin-react-hooks';
-import simpleImportSort from 'eslint-plugin-simple-import-sort'
+import simpleImportSort from 'eslint-plugin-simple-import-sort';
 // import reactRefresh from 'eslint-plugin-react-refresh';
 
 export default config(
@@ -24,7 +24,7 @@ export default config(
     files: ['**/*.ts*'],
     plugins: {
       'react-hooks': reactHooksPlugin,
-      'react': reactPlugin,
+      react: reactPlugin,
       'simple-import-sort': simpleImportSort
     },
     rules: {

package.json

@@ -58,7 +58,7 @@
     "i18next-browser-languagedetector": "^8.0.0",
     "java-slang": "^1.0.13",
     "js-cookie": "^3.0.5",
-    "js-slang": "^1.0.81",
+    "js-slang": "^1.0.82",
     "js-yaml": "^4.1.0",
     "konva": "^9.2.0",
     "language-directory": "https://github.com/source-academy/language-directory.git",

public/externalLibs/sound/soundToneMatrix.js

@@ -36,7 +36,7 @@ var timeout_matrix;
 // for coloring the matrix accordingly while it's being played
 var timeout_color;
 
-var timeout_objects = new Array();
+var timeout_objects = [];
 
 // vector_to_list returns a list that contains the elements of the argument vector
 // in the given order.
@@ -54,7 +54,7 @@ function vector_to_list(vector) {
 function x_y_to_row_column(x, y) {
   var row = Math.floor((y - margin_length) / (square_side_length + distance_between_squares));
   var column = Math.floor((x - margin_length) / (square_side_length + distance_between_squares));
-  return Array(row, column);
+  return [row, column];
 }
 
 // given the row number of a square, return the leftmost coordinate
@@ -365,5 +365,5 @@ function clear_all_timeout() {
     clearTimeout(timeout_objects[i]);
   }
 
-  timeout_objects = new Array();
+  timeout_objects = [];
 }

public/manifest.json

@@ -13,16 +13,16 @@
       "type": "image/png"
     },
     {
-        "src": "icons/android-chrome-256x256.png",
-        "sizes": "256x256",
-        "type": "image/png"
+      "src": "icons/android-chrome-256x256.png",
+      "sizes": "256x256",
+      "type": "image/png"
     },
     {
       "src": "icons/maskable.png",
       "sizes": "196x196",
       "type": "image/png",
       "purpose": "maskable"
-  }
+    }
   ],
   "start_url": "./",
   "display": "standalone",

src/commons/__tests__/Markdown.tsx

@@ -31,9 +31,6 @@ test('Markdown page renders correct Source information', () => {
   const source3Default = <Markdown {...mockProps(Chapter.SOURCE_3, Variant.DEFAULT)} />;
   expect(source3Default.props.content).toContain('Source \xa73');
 
-  const source3Concurrent = <Markdown {...mockProps(Chapter.SOURCE_3, Variant.CONCURRENT)} />;
-  expect(source3Concurrent.props.content).toContain('Source \xa73 Concurrent');
-
   const source4Default = <Markdown {...mockProps(Chapter.SOURCE_4, Variant.DEFAULT)} />;
   expect(source4Default.props.content).toContain('Source \xa74');
 });

src/commons/application/ApplicationTypes.ts

@@ -1,27 +1,27 @@
-import { Chapter, Language, SourceError, Variant } from 'js-slang/dist/types';
+import { Chapter, Language, type SourceError, type Value, Variant } from 'js-slang/dist/types';
 
-import { AchievementState } from '../../features/achievement/AchievementTypes';
-import { DashboardState } from '../../features/dashboard/DashboardTypes';
-import { PlaygroundState } from '../../features/playground/PlaygroundTypes';
+import type { AchievementState } from '../../features/achievement/AchievementTypes';
+import type { DashboardState } from '../../features/dashboard/DashboardTypes';
+import type { PlaygroundState } from '../../features/playground/PlaygroundTypes';
 import { PlaybackStatus, RecordingStatus } from '../../features/sourceRecorder/SourceRecorderTypes';
-import { StoriesEnvState, StoriesState } from '../../features/stories/StoriesTypes';
+import type { StoriesEnvState, StoriesState } from '../../features/stories/StoriesTypes';
 import { freshSortState } from '../../pages/academy/grading/subcomponents/GradingSubmissionsTable';
 import { WORKSPACE_BASE_PATHS } from '../../pages/fileSystem/createInBrowserFileSystem';
 import { defaultFeatureFlags, FeatureFlagsState } from '../featureFlags';
-import { FileSystemState } from '../fileSystem/FileSystemTypes';
-import { SideContentManagerState, SideContentState } from '../sideContent/SideContentTypes';
+import type { FileSystemState } from '../fileSystem/FileSystemTypes';
+import type { SideContentManagerState, SideContentState } from '../sideContent/SideContentTypes';
 import Constants from '../utils/Constants';
 import { createContext } from '../utils/JsSlangHelper';
-import {
+import type {
   DebuggerContext,
   WorkspaceLocation,
   WorkspaceManagerState,
   WorkspaceState
 } from '../workspace/WorkspaceTypes';
-import { RouterState } from './types/CommonsTypes';
+import type { RouterState } from './types/CommonsTypes';
 import { ExternalLibraryName } from './types/ExternalTypes';
-import { SessionState } from './types/SessionTypes';
-import { VscodeState as VscodeState } from './types/VscodeTypes';
+import type { SessionState } from './types/SessionTypes';
+import type { VscodeState as VscodeState } from './types/VscodeTypes';
 
 export type OverallState = {
   readonly router: RouterState;
@@ -74,7 +74,7 @@ export type CodeOutput = {
  */
 export type ResultOutput = {
   type: 'result';
-  value: any;
+  value: Value;
   consoleLogs: string[];
   runtime?: number;
   isProgram?: boolean;
@@ -160,7 +160,6 @@ type LanguageFeatures = Partial<{
 const variantDisplay: Map<Variant, string> = new Map([
   [Variant.TYPED, 'Typed'],
   [Variant.WASM, 'WebAssembly'],
-  [Variant.CONCURRENT, 'Concurrent'],
   [Variant.NATIVE, 'Native'],
   [Variant.EXPLICIT_CONTROL, 'Explicit-Control']
 ]);
@@ -266,7 +265,6 @@ const sourceSubLanguages: Array<Pick<SALanguage, 'chapter' | 'variant'>> = [
 
   { chapter: Chapter.SOURCE_3, variant: Variant.DEFAULT },
   { chapter: Chapter.SOURCE_3, variant: Variant.TYPED },
-  { chapter: Chapter.SOURCE_3, variant: Variant.CONCURRENT },
   { chapter: Chapter.SOURCE_3, variant: Variant.NATIVE },
 
   { chapter: Chapter.SOURCE_4, variant: Variant.DEFAULT },
@@ -288,13 +286,13 @@ export const sourceLanguages: SALanguage[] = sourceSubLanguages.map(sublang => {
     (variant === Variant.DEFAULT || variant === Variant.NATIVE || variant === Variant.TYPED);
 
   // Enable CSE Machine for Source Chapter 3 and above
-  supportedFeatures.cseMachine = chapter >= Chapter.SOURCE_3 && variant !== Variant.CONCURRENT;
+  supportedFeatures.cseMachine = chapter >= Chapter.SOURCE_3;
 
   // Local imports/exports require Source 2+ as Source 1 does not have lists.
   supportedFeatures.multiFile = chapter >= Chapter.SOURCE_2;
 
   // Disable REPL for concurrent variants
-  supportedFeatures.repl = variant !== Variant.CONCURRENT;
+  supportedFeatures.repl = true;
 
   return {
     ...sublang,

src/commons/application/__tests__/ApplicationTypes.ts

@@ -55,11 +55,6 @@ describe('available Source language configurations', () => {
         variant: Variant.TYPED,
         supports: { dataVisualizer: true, cseMachine: true }
       },
-      {
-        chapter: Chapter.SOURCE_3,
-        variant: Variant.CONCURRENT,
-        supports: { dataVisualizer: true }
-      },
       {
         chapter: Chapter.SOURCE_3,
         variant: Variant.NATIVE,

src/commons/application/__tests__/__snapshots__/ApplicationTypes.ts.snap

@@ -188,19 +188,6 @@ Array [
     },
     "variant": "typed",
   },
-  Object {
-    "chapter": 3,
-    "displayName": "Source §3 Concurrent",
-    "mainLanguage": "JavaScript",
-    "supports": Object {
-      "cseMachine": false,
-      "dataVisualizer": true,
-      "multiFile": true,
-      "repl": false,
-      "substVisualizer": false,
-    },
-    "variant": "concurrent",
-  },
   Object {
     "chapter": 3,
     "displayName": "Source §3 Native",

src/commons/application/actions/SessionActions.ts

@@ -4,27 +4,27 @@ import {
   unpublishedToBackendParams
 } from 'src/features/grading/GradingUtils';
 import { freshSortState } from 'src/pages/academy/grading/subcomponents/GradingSubmissionsTable';
-import { OptionType } from 'src/pages/academy/teamFormation/subcomponents/TeamFormationForm';
+import type { OptionType } from 'src/pages/academy/teamFormation/subcomponents/TeamFormationForm';
 
-import {
+import type {
   AllColsSortStates,
   GradingOverviews,
   GradingQuery
 } from '../../../features/grading/GradingTypes';
-import { TeamFormationOverview } from '../../../features/teamFormation/TeamFormationTypes';
-import {
+import type { TeamFormationOverview } from '../../../features/teamFormation/TeamFormationTypes';
+import type {
   Assessment,
   AssessmentConfiguration,
   AssessmentOverview,
   ContestEntry
 } from '../../assessment/AssessmentTypes';
-import {
+import type {
   Notification,
   NotificationFilterFunction
 } from '../../notificationBadge/NotificationBadgeTypes';
 import { generateOctokitInstance } from '../../utils/GitHubPersistenceHelper';
 import { Role, StoriesRole } from '../ApplicationTypes';
-import {
+import type {
   AdminPanelCourseRegistration,
   CourseRegistration,
   Tokens,
@@ -153,6 +153,4 @@ const SessionActions = createActions('session', {
 });
 
 // For compatibility with existing code (actions helper)
-export default {
-  ...SessionActions
-};
+export default SessionActions;

src/commons/mocks/ContextMocks.ts

@@ -1,9 +1,8 @@
 import { parse } from 'acorn';
-import { FunctionExpression, Node } from 'estree';
+import type { Node } from 'estree';
 import { ACORN_PARSE_OPTIONS } from 'js-slang/dist/constants';
 import createContext, { EnvTree } from 'js-slang/dist/createContext';
-import Closure from 'js-slang/dist/interpreter/closure';
-import { Context, Environment } from 'js-slang/dist/types';
+import type { Context } from 'js-slang/dist/types';
 import { TypeError } from 'js-slang/dist/utils/rttc';
 
 export function mockContext(chapter = 1): Context {
@@ -44,10 +43,6 @@ export function mockRuntimeContext(): Context {
   return context;
 }
 
-export function mockClosure(): Closure {
-  return new Closure({} as FunctionExpression, {} as Environment, {} as Context);
-}
-
 export function mockTypeError(): TypeError {
   // Typecast to Node to fix estree-acorn compatability.
   return new TypeError(parse('', ACORN_PARSE_OPTIONS) as Node, '', '', '');

src/commons/redux/__tests__/utils.ts

@@ -0,0 +1,69 @@
+import { testSaga } from 'redux-saga-test-plan';
+import WorkspaceActions from 'src/commons/workspace/WorkspaceActions';
+
+import { combineSagaHandlers, createActions } from '../utils';
+
+// Would have used spyOn, but for some reason that doesn't work properly
+jest.mock('src/commons/sagas/SafeEffects', () => ({
+  ...jest.requireActual('src/commons/sagas/SafeEffects'),
+  // Mock wrap saga to just be a passthrough so that the identity
+  // checking that testSaga uses will pass
+  wrapSaga: (x: any) => x
+}));
+
+test('test combineSagaHandlers', () => {
+  const mockTakeEveryHandler = jest.fn();
+  const mockTakeLatestHandler = jest.fn();
+  const mockTakeLeadingHandler = jest.fn();
+
+  const saga = combineSagaHandlers({
+    [WorkspaceActions.toggleUsingUpload.type]: mockTakeEveryHandler,
+    [WorkspaceActions.toggleFolderMode.type]: {
+      takeEvery: mockTakeEveryHandler
+    },
+    [WorkspaceActions.toggleUsingCse.type]: {
+      takeLatest: mockTakeLatestHandler
+    },
+    [WorkspaceActions.toggleUsingSubst.type]: {
+      takeLeading: mockTakeLeadingHandler
+    },
+    [WorkspaceActions.toggleEditorAutorun.type]: {
+      takeEvery: mockTakeEveryHandler,
+      takeLeading: mockTakeLeadingHandler
+    }
+  });
+
+  testSaga(saga)
+    .next()
+    .takeEvery(WorkspaceActions.toggleUsingUpload.type, mockTakeEveryHandler)
+    .next()
+    .takeEvery(WorkspaceActions.toggleFolderMode.type, mockTakeEveryHandler)
+    .next()
+    .takeLatest(WorkspaceActions.toggleUsingCse.type, mockTakeLatestHandler)
+    .next()
+    .takeLeading(WorkspaceActions.toggleUsingSubst.type, mockTakeLeadingHandler)
+    .next()
+    .takeEvery(WorkspaceActions.toggleEditorAutorun.type, mockTakeEveryHandler)
+    .next()
+    .takeLeading(WorkspaceActions.toggleEditorAutorun.type, mockTakeLeadingHandler)
+    .next()
+    .isDone();
+});
+
+test('createActions', () => {
+  const actions = createActions('workspace', {
+    act0: false,
+    act1: (value: string) => ({ value }),
+    act2: 525600
+  });
+
+  const act0 = actions.act0();
+  expect(act0.type).toEqual('workspace/act0');
+
+  const act1 = actions.act1('test');
+  expect(act1.type).toEqual('workspace/act1');
+  expect(act1.payload).toMatchObject({ value: 'test' });
+
+  const act2 = actions.act2();
+  expect(act2.type).toEqual('workspace/act2');
+});