loading js-slang and conductor from sourceacademy/ at npm

package.json

@@ -41,7 +41,8 @@
     "@reduxjs/toolkit": "^1.9.7",
     "@sentry/react": "^10.5.0",
     "@sourceacademy/c-slang": "^1.0.21",
-    "@sourceacademy/conductor": "https://github.com/source-academy/conductor.git#0.2.1",
+    "@sourceacademy/conductor": "^0.2.3",
+    "@sourceacademy/js-slang": "^1.0.85",
     "@sourceacademy/language-directory": "https://github.com/source-academy/language-directory.git#0.0.4",
     "@sourceacademy/plugin-directory": "https://github.com/source-academy/plugin-directory.git#0.0.2",
     "@sourceacademy/sharedb-ace": "2.1.1",
@@ -66,7 +67,6 @@
     "immer": "^9.0.21",
     "java-slang": "^1.0.13",
     "js-cookie": "^3.0.5",
-    "js-slang": "^1.0.85",
     "js-yaml": "^4.1.0",
     "konva": "^9.2.0",
     "lodash": "^4.17.21",

src/commons/XMLParser/XMLParserHelper.ts

@@ -1,4 +1,4 @@
-import { Chapter } from 'js-slang/dist/types';
+import { Chapter } from '@sourceacademy/js-slang/dist/types';
 import { Builder } from 'xml2js';
 
 import { ExternalLibraryName } from '../application/types/ExternalTypes';

src/commons/__tests__/Markdown.test.tsx

@@ -1,4 +1,4 @@
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 
 import { getLanguageConfig } from '../application/ApplicationTypes';
 import Markdown from '../Markdown';

src/commons/application/ApplicationTypes.ts

@@ -1,4 +1,4 @@
-import { Chapter, Language, type SourceError, type Value, Variant } from 'js-slang/dist/types';
+import { Chapter, Language, type SourceError, type Value, Variant } from '@sourceacademy/js-slang/dist/types';
 
 import type { AchievementState } from '../../features/achievement/AchievementTypes';
 import type { DashboardState } from '../../features/dashboard/DashboardTypes';
@@ -382,7 +382,7 @@ export const defaultEditorValue = '// Type your program in here!';
 
 /**
  * Create a default IWorkspaceState for 'resetting' a workspace.
- * Takes in parameters to set the js-slang library and chapter.
+ * Takes in parameters to set the @sourceacademy/js-slang library and chapter.
  *
  * @param workspaceLocation the location of the workspace, used for context
  */

src/commons/application/__tests__/ApplicationTypes.test.ts

@@ -1,4 +1,4 @@
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 
 import {
   ALL_LANGUAGES,

src/commons/application/actions/InterpreterActions.ts

@@ -1,4 +1,4 @@
-import { SourceError, Value } from 'js-slang/dist/types';
+import { SourceError, Value } from '@sourceacademy/js-slang/dist/types';
 import { createActions } from 'src/commons/redux/utils';
 
 import { WorkspaceLocation } from '../../workspace/WorkspaceTypes';

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

@@ -1,4 +1,4 @@
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import { mockStudents } from 'src/commons/mocks/UserMocks';
 import {
   paginationToBackendParams,

src/commons/application/reducers/__tests__/SessionReducer.test.ts

@@ -1,4 +1,4 @@
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 
 import { GradingOverview, GradingQuery } from '../../../../features/grading/GradingTypes';
 import {

src/commons/application/types/SessionTypes.ts

@@ -1,5 +1,5 @@
 import { Octokit } from '@octokit/rest';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 
 import { GradingOverviews, GradingQuery } from '../../../features/grading/GradingTypes';
 import { Device, DeviceSession } from '../../../features/remoteExecution/RemoteExecutionTypes';

src/commons/assessment/AssessmentTypes.ts

@@ -1,4 +1,4 @@
-import { Chapter, SourceError, Variant } from 'js-slang/dist/types';
+import { Chapter, SourceError, Variant } from '@sourceacademy/js-slang/dist/types';
 
 import { ExternalLibrary, ExternalLibraryName } from '../application/types/ExternalTypes';
 

src/commons/assessmentWorkspace/AssessmentWorkspace.tsx

@@ -12,7 +12,7 @@ import {
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import classNames from 'classnames';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import { isEqual } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';

src/commons/controlBar/ControlBarChapterSelect.tsx

@@ -2,7 +2,7 @@ import { Button, Menu, MenuItem } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import { ItemListRenderer, ItemRenderer, Select } from '@blueprintjs/select';
 import { IEvaluatorDefinition } from '@sourceacademy/language-directory/dist/types';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import React from 'react';
 import { useDispatch } from 'react-redux';
 

src/commons/controlBar/LegacyControlBarChapterSelect.tsx

@@ -1,7 +1,7 @@
 import { Button, Menu, MenuItem, Tooltip } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import { ItemListRenderer, ItemRenderer, Select } from '@blueprintjs/select';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import React from 'react';
 
 import {

src/commons/documentation/Documentation.ts

@@ -1,4 +1,4 @@
-import { SourceDocumentation } from 'js-slang';
+import { SourceDocumentation } from '@sourceacademy/js-slang';
 import { deviceTypes } from 'src/features/remoteExecution/RemoteExecutionTypes';
 
 import { externalLibraries } from '../application/types/ExternalTypes';

src/commons/dropdown/DropdownCreateCourse.tsx

@@ -13,7 +13,7 @@ import {
   TextArea
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import React from 'react';
 import { useDispatch } from 'react-redux';
 import AcademyActions from 'src/features/academy/AcademyActions';

src/commons/editingWorkspace/EditingWorkspace.tsx

@@ -10,7 +10,7 @@ import {
 } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import classNames from 'classnames';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { useNavigate } from 'react-router';

src/commons/editingWorkspaceSideContent/EditingWorkspaceSideContentDeploymentTab.tsx

@@ -1,7 +1,7 @@
 import { Button, Classes, Divider, MenuItem, Switch } from '@blueprintjs/core';
 import { IconNames } from '@blueprintjs/icons';
 import { ItemRenderer, Select } from '@blueprintjs/select';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import React from 'react';
 
 import { SALanguage, sourceLanguages, styliseSublanguage } from '../application/ApplicationTypes';

src/commons/editor/Editor.tsx

@@ -6,7 +6,7 @@ import 'ace-builds/src-noconflict/ace';
 import 'ace-builds/src-noconflict/ext-language_tools';
 import 'ace-builds/src-noconflict/ext-searchbox';
 import 'ace-builds/src-noconflict/ext-settings_menu';
-import 'js-slang/dist/editors/ace/theme/source';
+import '@sourceacademy/js-slang/dist/editors/ace/theme/source';
 
 /**
  * ace-builds/webpack-resolver is causing some issues in the testing environment.
@@ -21,7 +21,7 @@ import 'ace-builds/src-noconflict/keybinding-vim';
 import { Card } from '@blueprintjs/core';
 import * as AceBuilds from 'ace-builds';
 import { Ace, require as acequire, createEditSession } from 'ace-builds';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import React from 'react';
 import AceEditor, { IAceEditorProps, IEditorProps } from 'react-ace';
 import { IAceEditor } from 'react-ace/lib/types';

src/commons/editor/UseHighlighting.tsx

@@ -1,5 +1,5 @@
 import { Ace, Range as AceRange } from 'ace-builds';
-import { createContext, getAllOccurrencesInScope, getScope } from 'js-slang';
+import { createContext, getAllOccurrencesInScope, getScope } from '@sourceacademy/js-slang';
 import React from 'react';
 
 import { EditorHook } from './Editor';

src/commons/editor/UseNavigation.tsx

@@ -1,5 +1,5 @@
-import { createContext, hasDeclaration } from 'js-slang';
-import { Variant } from 'js-slang/dist/types';
+import { createContext, hasDeclaration } from '@sourceacademy/js-slang';
+import { Variant } from '@sourceacademy/js-slang/dist/types';
 import React from 'react';
 
 import { Documentation } from '../documentation/Documentation';

src/commons/editor/UseRefactor.tsx

@@ -1,5 +1,5 @@
 import { Range } from 'ace-builds';
-import { createContext, getAllOccurrencesInScope } from 'js-slang';
+import { createContext, getAllOccurrencesInScope } from '@sourceacademy/js-slang';
 import React from 'react';
 
 import { EditorHook } from './Editor';

src/commons/mocks/AssessmentMocks.ts

@@ -1,4 +1,4 @@
-import { Chapter } from 'js-slang/dist/types';
+import { Chapter } from '@sourceacademy/js-slang/dist/types';
 
 import { ExternalLibraryName } from '../application/types/ExternalTypes';
 import {

src/commons/mocks/ContextMocks.ts

@@ -1,9 +1,9 @@
 import { parse } from 'acorn';
 import type { Node } from 'estree';
-import { ACORN_PARSE_OPTIONS } from 'js-slang/dist/constants';
-import createContext, { EnvTree } from 'js-slang/dist/createContext';
-import type { Context } from 'js-slang/dist/types';
-import { TypeError } from 'js-slang/dist/utils/rttc';
+import { ACORN_PARSE_OPTIONS } from '@sourceacademy/js-slang/dist/constants';
+import createContext, { EnvTree } from '@sourceacademy/js-slang/dist/createContext';
+import type { Context } from '@sourceacademy/js-slang/dist/types';
+import { TypeError } from '@sourceacademy/js-slang/dist/utils/rttc';
 
 export function mockContext(chapter = 1): Context {
   return createContext(chapter);

src/commons/mocks/UserMocks.ts

@@ -1,4 +1,4 @@
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 
 import { GameState, Role } from '../application/ApplicationTypes';
 import {

src/commons/repl/Repl.tsx

@@ -1,9 +1,9 @@
 import { Card, Pre } from '@blueprintjs/core';
 import { Ace } from 'ace-builds';
 import classNames from 'classnames';
-import { parseError } from 'js-slang';
-import { Chapter, Variant } from 'js-slang/dist/types';
-import { stringify } from 'js-slang/dist/utils/stringify';
+import { parseError } from '@sourceacademy/js-slang';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
+import { stringify } from '@sourceacademy/js-slang/dist/utils/stringify';
 import React from 'react';
 
 import type { InterpreterOutput, ResultOutput } from '../application/ApplicationTypes';

src/commons/repl/ReplInput.tsx

@@ -1,7 +1,7 @@
 import { Classes } from '@blueprintjs/core';
 import { Ace } from 'ace-builds';
 import classNames from 'classnames';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import React from 'react';
 import AceEditor from 'react-ace';
 import ReactAce from 'react-ace/lib/ace';

src/commons/repl/__tests__/Repl.test.tsx

@@ -1,4 +1,4 @@
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import { ExternalLibraryName } from 'src/commons/application/types/ExternalTypes';
 import { shallowRender } from 'src/commons/utils/TestUtils';
 

src/commons/sagas/PersistenceSaga.tsx

@@ -2,7 +2,7 @@
 /// <reference types="gapi.client.drive-v3" />
 /// <reference types="google.picker" />
 import { Intent } from '@blueprintjs/core';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import { call, put, select } from 'redux-saga/effects';
 
 import type { PersistenceFile } from '../../features/persistence/PersistenceTypes';

src/commons/sagas/PlaygroundSaga.ts

@@ -1,5 +1,5 @@
 import type { FSModule } from 'browserfs/dist/node/core/FS';
-import { Chapter } from 'js-slang/dist/types';
+import { Chapter } from '@sourceacademy/js-slang/dist/types';
 import { compressToEncodedURIComponent } from 'lz-string';
 import qs from 'query-string';
 import { call, delay, put, race, select } from 'redux-saga/effects';

src/commons/sagas/RemoteExecutionSaga.ts

@@ -1,7 +1,7 @@
 import { SlingClient } from '@sourceacademy/sling-client';
-import { assemble, compileFiles, type Context } from 'js-slang';
-import { ExceptionError } from 'js-slang/dist/errors/errors';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { assemble, compileFiles, type Context } from '@sourceacademy/js-slang';
+import { ExceptionError } from '@sourceacademy/js-slang/dist/errors/errors';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import _ from 'lodash';
 import { call, put, race, select, take } from 'redux-saga/effects';
 import RemoteExecutionActions from 'src/features/remoteExecution/RemoteExecutionActions';
@@ -275,7 +275,7 @@ const RemoteExecutionSaga = combineSagaHandlers({
       (state: OverallState) => state.workspaces[session.workspace].context
     );
     // clear the context of errors (note: the way this works is that the context
-    // is mutated by js-slang anyway, so it's ok to do it like this)
+    // is mutated by @sourceacademy/js-slang anyway, so it's ok to do it like this)
     context.errors.length = 0;
     const compiled: MaybePromise<ReturnType<typeof compileFiles>> = yield call(
       compileFiles,

src/commons/sagas/StoriesSaga.ts

@@ -1,4 +1,4 @@
-import type { Context } from 'js-slang';
+import type { Context } from '@sourceacademy/js-slang';
 import { call, put, select } from 'redux-saga/effects';
 import StoriesActions from 'src/features/stories/StoriesActions';
 import {

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

@@ -1,4 +1,4 @@
-import type { Context } from 'js-slang';
+import type { Context } from '@sourceacademy/js-slang';
 import { call } from 'redux-saga/effects';
 
 import {

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

@@ -1,5 +1,5 @@
-import type { Context } from 'js-slang';
-import { defineSymbol } from 'js-slang/dist/createContext';
+import type { Context } from '@sourceacademy/js-slang';
+import { defineSymbol } from '@sourceacademy/js-slang/dist/createContext';
 import { put, select, take } from 'redux-saga/effects';
 import WorkspaceActions from 'src/commons/workspace/WorkspaceActions';
 

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

@@ -2,10 +2,10 @@ import { compileAndRun as compileAndRunCCode } from '@sourceacademy/c-slang/ctow
 import type { IConduit } from '@sourceacademy/conductor/dist/conduit';
 import { IEvaluatorDefinition } from '@sourceacademy/language-directory/dist/types';
 import { tokenizer } from 'acorn';
-import { type Context, interrupt, type Result, resume, runFilesInContext } from 'js-slang';
-import { ACORN_PARSE_OPTIONS } from 'js-slang/dist/constants';
-import { InterruptedError } from 'js-slang/dist/errors/errors';
-import { Chapter, ErrorSeverity, ErrorType, type SourceError, Variant } from 'js-slang/dist/types';
+import { type Context, interrupt, type Result, resume, runFilesInContext } from '@sourceacademy/js-slang';
+import { ACORN_PARSE_OPTIONS } from '@sourceacademy/js-slang/dist/constants';
+import { InterruptedError } from '@sourceacademy/js-slang/dist/errors/errors';
+import { Chapter, ErrorSeverity, ErrorType, type SourceError, Variant } from '@sourceacademy/js-slang/dist/types';
 import { pick } from 'lodash';
 import { eventChannel, type SagaIterator } from 'redux-saga';
 import { call, cancel, cancelled, fork, put, race, select, take } from 'redux-saga/effects';

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

@@ -1,5 +1,5 @@
-import { type Context, interrupt, runInContext } from 'js-slang';
-import { InterruptedError } from 'js-slang/dist/errors/errors';
+import { type Context, interrupt, runInContext } from '@sourceacademy/js-slang';
+import { InterruptedError } from '@sourceacademy/js-slang/dist/errors/errors';
 import { call, put, race, take } from 'redux-saga/effects';
 import InterpreterActions from 'src/commons/application/actions/InterpreterActions';
 

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

@@ -1,5 +1,5 @@
-import { Context } from 'js-slang';
-import { parse } from 'js-slang/dist/parser/parser';
+import { Context } from '@sourceacademy/js-slang';
+import { parse } from '@sourceacademy/js-slang/dist/parser/parser';
 import { put, StrictEffect } from 'redux-saga/effects';
 
 import { isSourceLanguage } from '../../../application/ApplicationTypes';

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

@@ -1,4 +1,4 @@
-import type { Context } from 'js-slang';
+import type { Context } from '@sourceacademy/js-slang';
 import { call } from 'redux-saga/effects';
 
 import { getDifferenceInMethods, getRestoreExtraMethodsString } from '../../../utils/JsSlangHelper';

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

@@ -1,4 +1,4 @@
-import type { Context } from 'js-slang';
+import type { Context } from '@sourceacademy/js-slang';
 import { random } from 'lodash';
 import { call, put, select, StrictEffect } from 'redux-saga/effects';
 

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

@@ -1,4 +1,4 @@
-import { Chapter } from 'js-slang/dist/types';
+import { Chapter } from '@sourceacademy/js-slang/dist/types';
 import { SagaIterator } from 'redux-saga';
 import { put, select } from 'redux-saga/effects';
 

src/commons/sagas/WorkspaceSaga/index.ts

@@ -1,6 +1,6 @@
 import type { FSModule } from 'browserfs/dist/node/core/FS';
-import { type Context, findDeclaration, getNames } from 'js-slang';
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { type Context, findDeclaration, getNames } from '@sourceacademy/js-slang';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import Phaser from 'phaser';
 import { call, put, select } from 'redux-saga/effects';
 

src/commons/sagas/__tests__/BackendSaga.test.ts

@@ -1,4 +1,4 @@
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import { createMemoryRouter } from 'react-router';
 import { call } from 'redux-saga/effects';
 import { expectSaga } from 'redux-saga-test-plan';

src/commons/sagas/__tests__/PersistenceSaga.test.ts

@@ -1,5 +1,5 @@
 /// <reference types="gapi.auth2" />
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import { expectSaga } from 'redux-saga-test-plan';
 import WorkspaceActions from 'src/commons/workspace/WorkspaceActions';
 import PlaygroundActions from 'src/features/playground/PlaygroundActions';

src/commons/sagas/__tests__/PlaygroundSaga.test.ts

@@ -1,4 +1,4 @@
-import { Chapter, Variant } from 'js-slang/dist/types';
+import { Chapter, Variant } from '@sourceacademy/js-slang/dist/types';
 import { compressToEncodedURIComponent } from 'lz-string';
 import qs from 'query-string';
 import { call } from 'redux-saga/effects';

src/commons/sagas/__tests__/SideContentSaga.test.ts

@@ -1,5 +1,5 @@
 import { IconNames } from '@blueprintjs/icons';
-import { Context } from 'js-slang';
+import { Context } from '@sourceacademy/js-slang';
 import { expectSaga } from 'redux-saga-test-plan';
 import { getDynamicTabs } from 'src/commons/sideContent/SideContentHelper';
 import { SideContentReducer } from 'src/commons/sideContent/SideContentReducer';

src/commons/sagas/__tests__/WorkspaceSaga.test.ts

@@ -5,9 +5,9 @@ import {
   resume,
   runFilesInContext,
   runInContext
-} from 'js-slang';
-import createContext from 'js-slang/dist/createContext';
-import { Chapter, ErrorType, type Finished, type SourceError, Variant } from 'js-slang/dist/types';
+} from '@sourceacademy/js-slang';
+import createContext from '@sourceacademy/js-slang/dist/createContext';
+import { Chapter, ErrorType, type Finished, type SourceError, Variant } from '@sourceacademy/js-slang/dist/types';
 import { call } from 'redux-saga/effects';
 import { expectSaga } from 'redux-saga-test-plan';
 import * as matchers from 'redux-saga-test-plan/matchers';