Remove Non-Det (#3104)

* Remove non det

* Update tests after removing non-det from variants

* Migrate eslint config to ES module

---------

Co-authored-by: sayomaki <[email protected]>

Author: leeyi45

eslint.config.js renamed to eslint.config.mjs

@@ -1,19 +1,16 @@
 // @ts-check
 
-// Todo: Use ES module
-const eslint = require('@eslint/js');
-const tseslint = require('typescript-eslint');
-const reactRefresh = require('eslint-plugin-react-refresh');
+// import eslint from '@eslint/js';
+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 reactRefresh from 'eslint-plugin-react-refresh';
 
-const FlatCompat = require('@eslint/eslintrc').FlatCompat;
-const compat = new FlatCompat({
-  baseDirectory: `${__dirname}`
-});
-
-module.exports = tseslint.config(
-  { ignores: ['eslint.config.js'] },
+export default config(
+  { ignores: ['eslint.config.mjs'] },
   // eslint.configs.recommended,
-  ...tseslint.configs.recommended,
+  ...configs.recommended,
   // TODO: Enable when ready
   // {
   //   plugins: {
@@ -23,14 +20,15 @@ module.exports = tseslint.config(
   //     'react-refresh/only-export-components': 'warn'
   //   }
   // },
-  ...compat.config({
-    extends: [
-      'plugin:react-hooks/recommended'
-      // "plugin:react/recommended",
-      // "plugin:react/jsx-runtime"
-    ],
-    plugins: ['simple-import-sort'],
+  {
+    files: ['**/*.ts*'],
+    plugins: {
+      'react-hooks': reactHooksPlugin,
+      'react': reactPlugin,
+      'simple-import-sort': simpleImportSort
+    },
     rules: {
+      ...reactHooksPlugin.configs['recommended-latest'].rules,
       'no-restricted-imports': [
         'error',
         {
@@ -73,5 +71,5 @@ module.exports = tseslint.config(
       ],
       'simple-import-sort/imports': 'error'
     }
-  })
+  }
 );

package.json

@@ -141,7 +141,7 @@
     "cross-env": "^7.0.3",
     "eslint": "^9.9.0",
     "eslint-plugin-react": "^7.35.0",
-    "eslint-plugin-react-hooks": "5.1.0-canary-cb151849e1-20240424",
+    "eslint-plugin-react-hooks": "^5.2.0",
     "eslint-plugin-react-refresh": "^0.4.9",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "https-browserify": "^1.0.0",

src/commons/__tests__/Markdown.tsx

@@ -37,9 +37,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 source3NonDet = <Markdown {...mockProps(Chapter.SOURCE_3, Variant.NON_DET)} />;
-  expect(source3NonDet.props.content).toContain('Source \xa73 Non-Det');
-
   const source3Concurrent = <Markdown {...mockProps(Chapter.SOURCE_3, Variant.CONCURRENT)} />;
   expect(source3Concurrent.props.content).toContain('Source \xa73 Concurrent');
 

src/commons/application/ApplicationTypes.ts

@@ -158,7 +158,6 @@ type LanguageFeatures = Partial<{
 const variantDisplay: Map<Variant, string> = new Map([
   [Variant.TYPED, 'Typed'],
   [Variant.WASM, 'WebAssembly'],
-  [Variant.NON_DET, 'Non-Det'],
   [Variant.CONCURRENT, 'Concurrent'],
   [Variant.LAZY, 'Lazy'],
   [Variant.GPU, 'GPU'],
@@ -270,7 +269,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.NON_DET },
   { chapter: Chapter.SOURCE_3, variant: Variant.NATIVE },
 
   { chapter: Chapter.SOURCE_4, variant: Variant.DEFAULT },
@@ -293,8 +291,7 @@ 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 && variant !== Variant.NON_DET;
+  supportedFeatures.cseMachine = chapter >= Chapter.SOURCE_3 && variant !== Variant.CONCURRENT;
 
   // Local imports/exports require Source 2+ as Source 1 does not have lists.
   supportedFeatures.multiFile = chapter >= Chapter.SOURCE_2;
@@ -426,7 +423,6 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
   enableDebugging: true,
   debuggerContext: {} as DebuggerContext,
   lastDebuggerResult: undefined,
-  lastNonDetResult: null,
   files: {}
 });
 

src/commons/application/__tests__/ApplicationTypes.ts

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

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

@@ -227,19 +227,6 @@ Array [
     },
     "variant": "concurrent",
   },
-  Object {
-    "chapter": 3,
-    "displayName": "Source §3 Non-Det",
-    "mainLanguage": "JavaScript",
-    "supports": Object {
-      "cseMachine": false,
-      "dataVisualizer": true,
-      "multiFile": true,
-      "repl": true,
-      "substVisualizer": false,
-    },
-    "variant": "non-det",
-  },
   Object {
     "chapter": 3,
     "displayName": "Source §3 Native",

src/commons/sagas/WorkspaceSaga/helpers/evalCode.ts

@@ -2,7 +2,7 @@ import { compileAndRun as compileAndRunCCode } from '@sourceacademy/c-slang/ctow
 import { tokenizer } from 'acorn';
 import { IConduit } from 'conductor/dist/conduit';
 import { Context, interrupt, Result, resume, runFilesInContext } from 'js-slang';
-import { ACORN_PARSE_OPTIONS, TRY_AGAIN } from 'js-slang/dist/constants';
+import { ACORN_PARSE_OPTIONS } from 'js-slang/dist/constants';
 import { InterruptedError } from 'js-slang/dist/errors/errors';
 import { manualToggleDebugger } from 'js-slang/dist/stdlib/inspector';
 import { Chapter, ErrorSeverity, ErrorType, SourceError, Variant } from 'js-slang/dist/types';
@@ -128,22 +128,9 @@ export function* evalCodeSaga(
   );
 
   const entrypointCode = files[entrypointFilePath];
-  const lastNonDetResult = yield select(
-    (state: OverallState) => state.workspaces[workspaceLocation].lastNonDetResult
-  );
 
   function call_variant(variant: Variant) {
-    if (variant === Variant.NON_DET) {
-      return entrypointCode.trim() === TRY_AGAIN
-        ? call(resume, lastNonDetResult)
-        : call(runFilesInContext, files, entrypointFilePath, context, {
-            executionMethod: 'interpreter',
-            originalMaxExecTime: execTime,
-            stepLimit: stepLimit,
-            useSubst: substActiveAndCorrectChapter,
-            envSteps: currentStep
-          });
-    } else if (variant === Variant.LAZY) {
+    if (variant === Variant.LAZY) {
       return call(runFilesInContext, files, entrypointFilePath, context, {
         scheduler: 'preemptive',
         originalMaxExecTime: execTime,
@@ -269,7 +256,6 @@ export function* evalCodeSaga(
       });
   }
 
-  const isNonDet: boolean = context.variant === Variant.NON_DET;
   const isLazy: boolean = context.variant === Variant.LAZY;
   const isWasm: boolean = context.variant === Variant.WASM;
   const isC: boolean = context.chapter === Chapter.FULL_C;
@@ -286,11 +272,19 @@ export function* evalCodeSaga(
       ? DisplayBufferService.attachConsole(workspaceLocation)
       : () => {};
 
-  const { result, interrupted, paused } = yield race({
+  const {
+    result,
+    interrupted,
+    paused
+  }: {
+    result: Result;
+    interrupted: any;
+    paused: any;
+  } = yield race({
     result:
       actionType === InterpreterActions.debuggerResume.type
         ? call(resume, lastDebuggerResult)
-        : isNonDet || isLazy || isWasm
+        : isLazy || isWasm
           ? call_variant(context.variant)
           : isC
             ? call(cCompileAndRun, entrypointCode, context)
@@ -357,7 +351,6 @@ export function* evalCodeSaga(
   if (
     result.status !== 'suspended' &&
     result.status !== 'finished' &&
-    result.status !== 'suspended-non-det' &&
     result.status !== 'suspended-cse-eval'
   ) {
     yield* dumpDisplayBuffer(workspaceLocation, isStoriesBlock, storyEnv);
@@ -401,11 +394,6 @@ export function* evalCodeSaga(
     yield put(actions.endDebuggerPause(workspaceLocation));
     yield put(actions.evalInterpreterSuccess('Breakpoint hit!', workspaceLocation));
     return;
-  } else if (isNonDet) {
-    if (result.value === 'cut') {
-      result.value = undefined;
-    }
-    yield put(actions.updateLastNonDetResult(result, workspaceLocation));
   }
 
   yield* dumpDisplayBuffer(workspaceLocation, isStoriesBlock, storyEnv);

src/commons/utils/Hooks.ts

@@ -1,10 +1,7 @@
 import { useMediaQuery } from '@mantine/hooks';
 import React, { RefObject } from 'react';
-import {
-  TypedUseSelectorHook,
-  // eslint-disable-next-line no-restricted-imports
-  useSelector
-} from 'react-redux';
+// eslint-disable-next-line no-restricted-imports
+import { TypedUseSelectorHook, useSelector } from 'react-redux';
 
 import { OverallState } from '../application/ApplicationTypes';
 import { Tokens } from '../application/types/SessionTypes';

src/commons/workspace/WorkspaceActions.ts

@@ -1,5 +1,5 @@
 import { createAction } from '@reduxjs/toolkit';
-import { Context, Result } from 'js-slang';
+import type { Context } from 'js-slang';
 import { Chapter, Variant } from 'js-slang/dist/types';
 
 import { AllColsSortStates, GradingColumnVisibility } from '../../features/grading/GradingTypes';
@@ -14,7 +14,6 @@ import {
   SubmissionsTableFilters,
   TOGGLE_USING_UPLOAD,
   UPDATE_LAST_DEBUGGER_RESULT,
-  UPDATE_LAST_NON_DET_RESULT,
   UPLOAD_FILES,
   WorkspaceLocation,
   WorkspaceLocationsWithTools,
@@ -281,13 +280,6 @@ export const updateLastDebuggerResult = createAction(
   })
 );
 
-export const updateLastNonDetResult = createAction(
-  UPDATE_LAST_NON_DET_RESULT,
-  (lastNonDetResult: Result, workspaceLocation: WorkspaceLocation) => ({
-    payload: { lastNonDetResult, workspaceLocation }
-  })
-);
-
 export const toggleUsingUpload = createAction(
   TOGGLE_USING_UPLOAD,
   (usingUpload: boolean, workspaceLocation: WorkspaceLocationsWithTools) => ({
@@ -306,7 +298,6 @@ export const uploadFiles = createAction(
 export default {
   ...newActions,
   updateLastDebuggerResult,
-  updateLastNonDetResult,
   toggleUsingUpload,
   uploadFiles
 };

src/commons/workspace/WorkspaceReducer.ts

@@ -380,10 +380,6 @@ const newWorkspaceReducer = createReducer(defaultWorkspaceManager, builder => {
     .addCase(WorkspaceActions.updateLastDebuggerResult, (state, action) => {
       const workspaceLocation = getWorkspaceLocation(action);
       state[workspaceLocation].lastDebuggerResult = action.payload.lastDebuggerResult;
-    })
-    .addCase(WorkspaceActions.updateLastNonDetResult, (state, action) => {
-      const workspaceLocation = getWorkspaceLocation(action);
-      state[workspaceLocation].lastNonDetResult = action.payload.lastNonDetResult;
     });
 });
 

src/commons/workspace/WorkspaceTypes.ts

@@ -1,4 +1,4 @@
-import { Context, Result } from 'js-slang';
+import type { Context } from 'js-slang';
 
 import { AllColsSortStates, GradingColumnVisibility } from '../../features/grading/GradingTypes';
 import { SourcecastWorkspaceState } from '../../features/sourceRecorder/sourcecast/SourcecastTypes';
@@ -11,7 +11,6 @@ import { UploadResult } from '../sideContent/content/SideContentUpload';
 
 export const EVAL_SILENT = 'EVAL_SILENT';
 export const UPDATE_LAST_DEBUGGER_RESULT = 'UPDATE_LAST_DEBUGGER_RESULT';
-export const UPDATE_LAST_NON_DET_RESULT = 'UPDATE_LAST_NON_DET_RESULT';
 export const TOGGLE_USING_UPLOAD = 'TOGGLE_USING_UPLOAD';
 export const UPLOAD_FILES = 'UPLOAD_FILES';
 
@@ -106,7 +105,6 @@ export type WorkspaceState = {
   readonly globals: Array<[string, any]>;
   readonly debuggerContext: DebuggerContext;
   readonly lastDebuggerResult: any;
-  readonly lastNonDetResult: Result | null;
   readonly files: UploadResult;
 };
 

yarn.lock

@@ -8721,15 +8721,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:5.1.0-canary-cb151849e1-20240424":
-  version: 5.1.0-canary-cb151849e1-20240424
-  resolution: "eslint-plugin-react-hooks@npm:5.1.0-canary-cb151849e1-20240424"
-  peerDependencies:
-    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0
-  checksum: 10c0/dc5d002443861ec93872c4e43b5815e9a1c15cdd4b86f96783291c4c642ed92048334cd3c434d74642cafcf397762450239f4f74e44dce6198256ad421bc4ebd
-  languageName: node
-  linkType: hard
-
 "eslint-plugin-react-hooks@npm:^4.3.0":
   version: 4.6.0
   resolution: "eslint-plugin-react-hooks@npm:4.6.0"
@@ -8739,6 +8730,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-react-hooks@npm:^5.2.0":
+  version: 5.2.0
+  resolution: "eslint-plugin-react-hooks@npm:5.2.0"
+  peerDependencies:
+    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0
+  checksum: 10c0/1c8d50fa5984c6dea32470651807d2922cc3934cf3425e78f84a24c2dfd972e7f019bee84aefb27e0cf2c13fea0ac1d4473267727408feeb1c56333ca1489385
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-react-refresh@npm:^0.4.9":
   version: 0.4.9
   resolution: "eslint-plugin-react-refresh@npm:0.4.9"
@@ -9655,7 +9655,7 @@ __metadata:
     dompurify: "npm:^3.2.4"
     eslint: "npm:^9.9.0"
     eslint-plugin-react: "npm:^7.35.0"
-    eslint-plugin-react-hooks: "npm:5.1.0-canary-cb151849e1-20240424"
+    eslint-plugin-react-hooks: "npm:^5.2.0"
     eslint-plugin-react-refresh: "npm:^0.4.9"
     eslint-plugin-simple-import-sort: "npm:^12.1.1"
     flexboxgrid: "npm:^6.3.1"