Add Token Counter Displayer in Repl

src/commons/application/ApplicationTypes.ts

@@ -88,7 +88,22 @@ export type ErrorOutput = {
   consoleLogs: string[];
 };
 
-export type InterpreterOutput = RunningOutput | CodeOutput | ResultOutput | ErrorOutput;
+/**
+ * An output which represents a message being displayed to the user. Not a true
+ * result from the program, but rather a customised notification meant to highlight
+ * events that occur outside execution of the program.
+ */
+export type NotificationOutput = {
+  type: 'notification';
+  consoleLog: string;
+};
+
+export type InterpreterOutput =
+  | RunningOutput
+  | CodeOutput
+  | ResultOutput
+  | ErrorOutput
+  | NotificationOutput;
 
 export enum Role {
   Student = 'student',
@@ -360,6 +375,9 @@ export const createDefaultWorkspace = (workspaceLocation: WorkspaceLocation): Wo
     originalValue: ''
   },
   replValue: '',
+  hasTokenCounter: false,
+  tokenCount: 0,
+  customNotification: '',
   sharedbConnected: false,
   stepLimit: 1000,
   globals: [],

src/commons/application/actions/__tests__/SessionActions.ts

@@ -274,6 +274,7 @@ test('setAssessmentConfigurations generates correct action object', () => {
       type: 'Mission1',
       isManuallyGraded: true,
       displayInDashboard: true,
+      hasTokenCounter: false,
       hoursBeforeEarlyXpDecay: 48,
       earlySubmissionXp: 200
     },
@@ -282,6 +283,7 @@ test('setAssessmentConfigurations generates correct action object', () => {
       type: 'Mission2',
       isManuallyGraded: true,
       displayInDashboard: true,
+      hasTokenCounter: false,
       hoursBeforeEarlyXpDecay: 48,
       earlySubmissionXp: 200
     },
@@ -290,6 +292,7 @@ test('setAssessmentConfigurations generates correct action object', () => {
       type: 'Mission3',
       isManuallyGraded: true,
       displayInDashboard: true,
+      hasTokenCounter: false,
       hoursBeforeEarlyXpDecay: 48,
       earlySubmissionXp: 200
     }
@@ -640,6 +643,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       type: 'Missions',
       isManuallyGraded: true,
       displayInDashboard: true,
+      hasTokenCounter: false,
       hoursBeforeEarlyXpDecay: 48,
       earlySubmissionXp: 200
     },
@@ -648,6 +652,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       type: 'Quests',
       isManuallyGraded: true,
       displayInDashboard: true,
+      hasTokenCounter: false,
       hoursBeforeEarlyXpDecay: 48,
       earlySubmissionXp: 200
     },
@@ -656,6 +661,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       type: 'Paths',
       isManuallyGraded: true,
       displayInDashboard: true,
+      hasTokenCounter: false,
       hoursBeforeEarlyXpDecay: 48,
       earlySubmissionXp: 200
     },
@@ -664,6 +670,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       type: 'Contests',
       isManuallyGraded: true,
       displayInDashboard: true,
+      hasTokenCounter: false,
       hoursBeforeEarlyXpDecay: 48,
       earlySubmissionXp: 200
     },
@@ -672,6 +679,7 @@ test('updateAssessmentTypes generates correct action object', () => {
       type: 'Others',
       isManuallyGraded: true,
       displayInDashboard: true,
+      hasTokenCounter: false,
       hoursBeforeEarlyXpDecay: 48,
       earlySubmissionXp: 200
     }
@@ -689,6 +697,7 @@ test('deleteAssessmentConfig generates correct action object', () => {
     type: 'Mission1',
     isManuallyGraded: true,
     displayInDashboard: true,
+    hasTokenCounter: false,
     hoursBeforeEarlyXpDecay: 48,
     earlySubmissionXp: 200
   };

src/commons/assessment/AssessmentTypes.ts

@@ -81,6 +81,7 @@ export type Assessment = {
   type: AssessmentType;
   globalDeployment?: Library; // For mission control
   graderDeployment?: Library; // For mission control
+  hasTokenCounter?: boolean;
   id: number;
   longSummary: string;
   missionPDF: string;
@@ -95,6 +96,7 @@ export type AssessmentConfiguration = {
   displayInDashboard: boolean;
   hoursBeforeEarlyXpDecay: number;
   earlySubmissionXp: number;
+  hasTokenCounter: boolean;
 };
 
 export interface IProgrammingQuestion extends BaseQuestion {

src/commons/assessment/__tests__/Assessment.tsx

@@ -17,6 +17,7 @@ const mockAssessmentProps = assertType<AssessmentProps>()({
     type: 'Missions',
     isManuallyGraded: true,
     displayInDashboard: true,
+    hasTokenCounter: false,
     hoursBeforeEarlyXpDecay: 48,
     earlySubmissionXp: 200
   }

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -76,6 +76,8 @@ import {
   changeExecTime,
   changeSideContentHeight,
   clearReplOutput,
+  disableTokenCounter,
+  enableTokenCounter,
   evalEditor,
   evalRepl,
   evalTestcase,
@@ -111,6 +113,7 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
   const { isMobileBreakpoint } = useResponsive();
 
   const assessment = useTypedSelector(state => state.session.assessments.get(props.assessmentId));
+
   const [selectedTab, setSelectedTab] = useState(
     assessment?.questions[props.questionId].grader !== undefined
       ? SideContentType.grading
@@ -149,7 +152,9 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
     handleEditorUpdateBreakpoints,
     handleReplEval,
     handleSave,
-    handleUpdateHasUnsavedChanges
+    handleUpdateHasUnsavedChanges,
+    handleEnableTokenCounter,
+    handleDisableTokenCounter
   } = useMemo(() => {
     return {
       handleTestcaseEval: (id: number) => dispatch(evalTestcase(workspaceLocation, id)),
@@ -173,7 +178,9 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
       handleSave: (id: number, answer: number | string | ContestEntry[]) =>
         dispatch(submitAnswer(id, answer)),
       handleUpdateHasUnsavedChanges: (hasUnsavedChanges: boolean) =>
-        dispatch(updateHasUnsavedChanges(workspaceLocation, hasUnsavedChanges))
+        dispatch(updateHasUnsavedChanges(workspaceLocation, hasUnsavedChanges)),
+      handleEnableTokenCounter: () => dispatch(enableTokenCounter(workspaceLocation)),
+      handleDisableTokenCounter: () => dispatch(disableTokenCounter(workspaceLocation))
     };
   }, [dispatch]);
 
@@ -238,6 +245,21 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
     checkWorkspaceReset();
   });
 
+  /**
+   * Handles toggling enabling and disabling token counter depending on assessment properties
+   */
+  useEffect(() => {
+    if (props.assessmentConfiguration.hasTokenCounter) {
+      handleEnableTokenCounter();
+    } else {
+      handleDisableTokenCounter();
+    }
+  }, [
+    props.assessmentConfiguration.hasTokenCounter,
+    handleEnableTokenCounter,
+    handleDisableTokenCounter
+  ]);
+
   /**
    * Handles toggling of relevant SideContentTabs when mobile breakpoint it hit
    */
@@ -839,7 +861,6 @@ const AssessmentWorkspace: React.FC<AssessmentWorkspaceProps> = props => {
     sideBarProps: sideBarProps,
     mobileSideContentProps: mobileSideContentProps(questionId)
   };
-
   return (
     <div className={classNames('WorkspaceParent', Classes.DARK)}>
       {overlay}

src/commons/assessmentWorkspace/__tests__/AssessmentWorkspace.tsx

@@ -26,6 +26,7 @@ const defaultProps = assertType<AssessmentWorkspaceProps>()({
     type: 'Missions',
     isManuallyGraded: true,
     displayInDashboard: true,
+    hasTokenCounter: false,
     hoursBeforeEarlyXpDecay: 48,
     earlySubmissionXp: 200
   },

src/commons/mocks/AssessmentMocks.ts

@@ -22,6 +22,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       displayInDashboard: true,
       hoursBeforeEarlyXpDecay: 48,
+      hasTokenCounter: false,
       earlySubmissionXp: 200
     },
     {
@@ -30,6 +31,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       displayInDashboard: true,
       hoursBeforeEarlyXpDecay: 48,
+      hasTokenCounter: false,
       earlySubmissionXp: 200
     },
     {
@@ -38,6 +40,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       displayInDashboard: true,
       hoursBeforeEarlyXpDecay: 48,
+      hasTokenCounter: false,
       earlySubmissionXp: 200
     },
     {
@@ -46,6 +49,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       displayInDashboard: true,
       hoursBeforeEarlyXpDecay: 48,
+      hasTokenCounter: true,
       earlySubmissionXp: 200
     },
     {
@@ -54,6 +58,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       displayInDashboard: true,
       hoursBeforeEarlyXpDecay: 48,
+      hasTokenCounter: false,
       earlySubmissionXp: 200
     }
   ],
@@ -64,6 +69,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       displayInDashboard: true,
       hoursBeforeEarlyXpDecay: 48,
+      hasTokenCounter: false,
       earlySubmissionXp: 200
     },
     {
@@ -72,6 +78,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       displayInDashboard: true,
       hoursBeforeEarlyXpDecay: 48,
+      hasTokenCounter: false,
       earlySubmissionXp: 200
     },
     {
@@ -80,6 +87,7 @@ export const mockAssessmentConfigurations: AssessmentConfiguration[][] = [
       isManuallyGraded: true,
       displayInDashboard: true,
       hoursBeforeEarlyXpDecay: 48,
+      hasTokenCounter: false,
       earlySubmissionXp: 200
     }
   ]

src/commons/profile/__tests__/Profile.tsx

@@ -25,6 +25,7 @@ const assessmentConfigurations: AssessmentConfiguration[] = [
   type: c,
   isManuallyGraded: false,
   displayInDashboard: false,
+  hasTokenCounter: false,
   hoursBeforeEarlyXpDecay: 0,
   earlySubmissionXp: 0
 }));

src/commons/repl/Repl.tsx

@@ -122,6 +122,12 @@ export const Output: React.FC<OutputProps> = (props: OutputProps) => {
           </Card>
         );
       }
+    case 'notification':
+      return (
+        <Card className="notification-output-container">
+          <Pre className="notification-output">{'💡 ' + props.output.consoleLog}</Pre>
+        </Card>
+      );
     default:
       return <Card>''</Card>;
   }

src/commons/sagas/BackendSaga.ts

@@ -777,7 +777,6 @@ function* BackendSaga(): SagaIterator {
       getAssessmentConfigs,
       tokens
     );
-
     if (assessmentConfigs) {
       yield put(actions.setAssessmentConfigurations(assessmentConfigs));
     }
@@ -982,6 +981,7 @@ function* BackendSaga(): SagaIterator {
         isManuallyGraded: true,
         displayInDashboard: true,
         hoursBeforeEarlyXpDecay: 0,
+        hasTokenCounter: false,
         earlySubmissionXp: 0
       }
     ];

src/commons/sagas/WorkspaceSaga.ts

@@ -1,3 +1,4 @@
+import { tokenizer } from 'acorn';
 import { FSModule } from 'browserfs/dist/node/core/FS';
 import {
   Context,
@@ -9,7 +10,7 @@ import {
   runFilesInContext,
   runInContext
 } from 'js-slang';
-import { TRY_AGAIN } from 'js-slang/dist/constants';
+import { ACORN_PARSE_OPTIONS, TRY_AGAIN } from 'js-slang/dist/constants';
 import { defineSymbol } from 'js-slang/dist/createContext';
 import { InterruptedError } from 'js-slang/dist/errors/errors';
 import { parse } from 'js-slang/dist/parser/parser';
@@ -1256,6 +1257,13 @@ export function* evalCode(
 
   yield* dumpDisplayBuffer(workspaceLocation, isStoriesBlock, storyEnv);
 
+  // Change token count if its assessment and EVAL_EDITOR
+  if (actionType === EVAL_EDITOR && workspaceLocation === 'assessment') {
+    const tokens = [...tokenizer(entrypointCode, ACORN_PARSE_OPTIONS)];
+    const tokenCounter = tokens.length;
+    yield put(actions.setTokenCount(workspaceLocation, tokenCounter));
+  }
+
   // Do not write interpreter output to REPL, if executing chunks (e.g. prepend/postpend blocks)
   if (actionType !== EVAL_SILENT) {
     if (!isStoriesBlock) {

src/commons/sagas/__tests__/BackendSaga.ts

@@ -218,6 +218,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: true,
     displayInDashboard: true,
     hoursBeforeEarlyXpDecay: 48,
+    hasTokenCounter: false,
     earlySubmissionXp: 200
   },
   {
@@ -226,6 +227,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: true,
     displayInDashboard: true,
     hoursBeforeEarlyXpDecay: 48,
+    hasTokenCounter: false,
     earlySubmissionXp: 200
   },
   {
@@ -234,6 +236,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: false,
     displayInDashboard: false,
     hoursBeforeEarlyXpDecay: 48,
+    hasTokenCounter: false,
     earlySubmissionXp: 200
   },
   {
@@ -242,6 +245,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: false,
     displayInDashboard: false,
     hoursBeforeEarlyXpDecay: 48,
+    hasTokenCounter: true,
     earlySubmissionXp: 200
   },
   {
@@ -250,6 +254,7 @@ const mockAssessmentConfigurations: AssessmentConfiguration[] = [
     isManuallyGraded: true,
     displayInDashboard: false,
     hoursBeforeEarlyXpDecay: 48,
+    hasTokenCounter: false,
     earlySubmissionXp: 200
   }
 ];
@@ -1002,6 +1007,7 @@ describe('Test CREATE_COURSE action', () => {
       isManuallyGraded: true,
       displayInDashboard: true,
       hoursBeforeEarlyXpDecay: 0,
+      hasTokenCounter: false,
       earlySubmissionXp: 0
     }
   ];