@elice/material-exercise 1.230316.0 → 1.230325.0

package/cjs/components/material-exercise/context/recoil.d.ts

@@ -146,3 +146,7 @@ export declare const exerciseFileEditorCursorState: import("recoil").RecoilState
  *
  */
 export declare const exerciseFileEditorCursorSelectionValueState: import("recoil").RecoilState<string | null>;
+/**
+ *
+ */
+export declare const exerciseMonacoEditorValueState: import("recoil").RecoilState<string>;

package/cjs/components/material-exercise/context/recoil.js

@@ -622,6 +622,14 @@ const exerciseFileEditorCursorSelectionValueState = recoil.atom({
   key: `${KEY_PREFIX}/FileEditorCursorSelectionValue`,
   default: null
 });
+/**
+ *
+ */
+
+const exerciseMonacoEditorValueState = recoil.atom({
+  key: `${KEY_PREFIX}/MonacoEditorValueState`,
+  default: ''
+});
 
 exports.exerciseActiveFilenameState = exerciseActiveFilenameState;
 exports.exerciseArduinoAgentConnectionState = exerciseArduinoAgentConnectionState;
@@ -638,6 +646,7 @@ exports.exerciseFileEditorCursorState = exerciseFileEditorCursorState;
 exports.exerciseFileTabsOpenedState = exerciseFileTabsOpenedState;
 exports.exerciseFileTreeOpenedState = exerciseFileTreeOpenedState;
 exports.exerciseLectureState = exerciseLectureState;
+exports.exerciseMonacoEditorValueState = exerciseMonacoEditorValueState;
 exports.exerciseMultilangEnvironmentState = exerciseMultilangEnvironmentState;
 exports.exerciseMultilangLanguagesState = exerciseMultilangLanguagesState;
 exports.exercisePreviewDisplayModeState = exercisePreviewDisplayModeState;

package/cjs/components/material-exercise/context/types.d.ts

@@ -64,7 +64,7 @@ export declare type MaterialExerciseCommonPropExerciseImageEmptyOptions = Exerci
 /**
  * On code help button click.
  */
-export declare type MaterialExerciseCommonPropOnCodeHelpRequest = (code: string, error?: CodeHelperError) => void;
+export declare type MaterialExerciseCommonPropOnCodeHelpRequest = (code: string, error?: CodeHelperError, payload?: any) => void;
 /**
  * On default exercise room ID set.
  */

package/cjs/components/material-exercise/exercise-file-editor/ExerciseFileEditor.js

@@ -59,7 +59,8 @@ const ExerciseFileEditor = () => {
   const readOnly = readOnlyEditor || readOnlyActiveFile;
   const setUsercodeWebSocketState = recoil.useSetRecoilState(recoil$1.exerciseWebsocketQuery('usercodeEdit'));
   const setFileEditorCursorState = recoil.useSetRecoilState(recoil$1.exerciseFileEditorCursorState);
-  const setFileEditorCursorSelectionValueState = recoil.useSetRecoilState(recoil$1.exerciseFileEditorCursorSelectionValueState); // editor
+  const setFileEditorCursorSelectionValueState = recoil.useSetRecoilState(recoil$1.exerciseFileEditorCursorSelectionValueState);
+  const setExerciseMonacoEditorValueState = recoil.useSetRecoilState(recoil$1.exerciseMonacoEditorValueState); // editor
 
   const editorApis = React__default["default"].useRef(null);
   const editorDocHistories = React__default["default"].useRef({});
@@ -90,6 +91,7 @@ const ExerciseFileEditor = () => {
     }
 
     if (content) {
+      setExerciseMonacoEditorValueState(content);
       (_a = editorApis.current) === null || _a === void 0 ? void 0 : _a.setValue(content);
     } // reset as initial value on `null` received.
     else if (content === null) {
@@ -106,6 +108,7 @@ const ExerciseFileEditor = () => {
         var _a;
 
         if (typeof content === 'string') {
+          setExerciseMonacoEditorValueState(content);
           (_a = editorApis.current) === null || _a === void 0 ? void 0 : _a.setValue(content);
         } else {
           setFileResettable(false);
@@ -260,6 +263,8 @@ const ExerciseFileEditor = () => {
       return;
     }
 
+    setExerciseMonacoEditorValueState(wsUsercode.doc);
+
     _editorApis.setValue(wsUsercode.doc);
 
     pushEditorDocHistories();

package/cjs/components/material-exercise/exercise-runner/ExerciseRunner.js

@@ -78,16 +78,24 @@ const ExerciseRunner = ({
   const setRunnerStdioFilesState = recoil.useSetRecoilState(recoil$1.exerciseRunnerStdioFilesState); // preview states
 
   const exercisePreviewType = recoil.useRecoilValue(recoil$1.exercisePreviewTypeState(materialExerciseId));
-  const exercisePreviewDisplayMode = recoil.useRecoilValue(recoil$1.exercisePreviewDisplayModeState); // websockets
+  const exercisePreviewDisplayMode = recoil.useRecoilValue(recoil$1.exercisePreviewDisplayModeState); // monaco editor value
+
+  const getExerciseMonacoEditorValueState = recoil.useRecoilValue(recoil$1.exerciseMonacoEditorValueState); // websockets
 
   const setRunnerRoomWebSocketState = recoil.useSetRecoilState(recoil$1.exerciseWebsocketQuery('runnerRoom'));
   const setStdioWebSocketState = recoil.useSetRecoilState(recoil$1.exerciseWebsocketQuery('stdio'));
 
   const handleAiHelpibotError = text => {
+    var _a, _b;
+
     const error = runner.getProgrammingErrorResult(text);
 
     if (!!error && typeof onCodeHelpRequest === 'function') {
-      onCodeHelpRequest(error.errorCode, error);
+      onCodeHelpRequest(error.errorCode, error, {
+        readme: (_a = exercise === null || exercise === void 0 ? void 0 : exercise.description) !== null && _a !== void 0 ? _a : '',
+        instruction: (_b = exercise === null || exercise === void 0 ? void 0 : exercise.instructionContent) !== null && _b !== void 0 ? _b : '',
+        openFileContent: getExerciseMonacoEditorValueState
+      });
     }
   };
 

package/es/components/material-exercise/context/recoil.d.ts

@@ -146,3 +146,7 @@ export declare const exerciseFileEditorCursorState: import("recoil").RecoilState
  *
  */
 export declare const exerciseFileEditorCursorSelectionValueState: import("recoil").RecoilState<string | null>;
+/**
+ *
+ */
+export declare const exerciseMonacoEditorValueState: import("recoil").RecoilState<string>;

package/es/components/material-exercise/context/recoil.js

@@ -614,5 +614,13 @@ const exerciseFileEditorCursorSelectionValueState = atom({
   key: `${KEY_PREFIX}/FileEditorCursorSelectionValue`,
   default: null
 });
+/**
+ *
+ */
+
+const exerciseMonacoEditorValueState = atom({
+  key: `${KEY_PREFIX}/MonacoEditorValueState`,
+  default: ''
+});
 
-export { exerciseActiveFilenameState, exerciseArduinoAgentConnectionState, exerciseArduinoAgentModalState, exerciseArduinoOnSelectPortState, exerciseArduinoOpenedPortNameState, exerciseArduinoPortsState, exerciseArduinoPreferenceState, exerciseArduinoUploadProgressState, exerciseContainerSizeState, exerciseEditorPreferenceState, exerciseFileEditorCursorSelectionValueState, exerciseFileEditorCursorState, exerciseFileTabsOpenedState, exerciseFileTreeOpenedState, exerciseLectureState, exerciseMultilangEnvironmentState, exerciseMultilangLanguagesState, exercisePreviewDisplayModeState, exercisePreviewTypeState, exerciseRightpaneActiveState, exerciseRoomState, exerciseRunnerRoomConnectionInfoState, exerciseRunnerRunTypeState, exerciseRunnerRunningState, exerciseRunnerStdioFilesState, exerciseRunnerSubmittingState, exerciseRunnerWebSocketStatusQuery, exerciseState, exerciseUserState, exerciseWebsocketQuery, exerciseWebsocketStates };
+export { exerciseActiveFilenameState, exerciseArduinoAgentConnectionState, exerciseArduinoAgentModalState, exerciseArduinoOnSelectPortState, exerciseArduinoOpenedPortNameState, exerciseArduinoPortsState, exerciseArduinoPreferenceState, exerciseArduinoUploadProgressState, exerciseContainerSizeState, exerciseEditorPreferenceState, exerciseFileEditorCursorSelectionValueState, exerciseFileEditorCursorState, exerciseFileTabsOpenedState, exerciseFileTreeOpenedState, exerciseLectureState, exerciseMonacoEditorValueState, exerciseMultilangEnvironmentState, exerciseMultilangLanguagesState, exercisePreviewDisplayModeState, exercisePreviewTypeState, exerciseRightpaneActiveState, exerciseRoomState, exerciseRunnerRoomConnectionInfoState, exerciseRunnerRunTypeState, exerciseRunnerRunningState, exerciseRunnerStdioFilesState, exerciseRunnerSubmittingState, exerciseRunnerWebSocketStatusQuery, exerciseState, exerciseUserState, exerciseWebsocketQuery, exerciseWebsocketStates };

package/es/components/material-exercise/context/types.d.ts

@@ -64,7 +64,7 @@ export declare type MaterialExerciseCommonPropExerciseImageEmptyOptions = Exerci
 /**
  * On code help button click.
  */
-export declare type MaterialExerciseCommonPropOnCodeHelpRequest = (code: string, error?: CodeHelperError) => void;
+export declare type MaterialExerciseCommonPropOnCodeHelpRequest = (code: string, error?: CodeHelperError, payload?: any) => void;
 /**
  * On default exercise room ID set.
  */

package/es/components/material-exercise/exercise-file-editor/ExerciseFileEditor.js

@@ -16,7 +16,7 @@ import 'monaco-editor/esm/vs/editor/editor.api';
 import '../../shared/monaco-editor/constants/monaco/preferences.js';
 import 'react-use';
 import 'socket.io-client';
-import { exerciseState, exerciseRoomState, exerciseLectureState, exerciseEditorPreferenceState, exerciseActiveFilenameState, exerciseWebsocketQuery, exerciseFileEditorCursorState, exerciseFileEditorCursorSelectionValueState } from '../context/recoil.js';
+import { exerciseState, exerciseRoomState, exerciseLectureState, exerciseEditorPreferenceState, exerciseActiveFilenameState, exerciseWebsocketQuery, exerciseFileEditorCursorState, exerciseFileEditorCursorSelectionValueState, exerciseMonacoEditorValueState } from '../context/recoil.js';
 import { ExerciseContext } from '../context/context.js';
 import '../context/recoilTypes.js';
 import { exerciseFileEditorContentChange$, exerciseFileEditorSaveAction$ } from '../context/subjects.js';
@@ -53,7 +53,8 @@ const ExerciseFileEditor = () => {
   const readOnly = readOnlyEditor || readOnlyActiveFile;
   const setUsercodeWebSocketState = useSetRecoilState(exerciseWebsocketQuery('usercodeEdit'));
   const setFileEditorCursorState = useSetRecoilState(exerciseFileEditorCursorState);
-  const setFileEditorCursorSelectionValueState = useSetRecoilState(exerciseFileEditorCursorSelectionValueState); // editor
+  const setFileEditorCursorSelectionValueState = useSetRecoilState(exerciseFileEditorCursorSelectionValueState);
+  const setExerciseMonacoEditorValueState = useSetRecoilState(exerciseMonacoEditorValueState); // editor
 
   const editorApis = React.useRef(null);
   const editorDocHistories = React.useRef({});
@@ -84,6 +85,7 @@ const ExerciseFileEditor = () => {
     }
 
     if (content) {
+      setExerciseMonacoEditorValueState(content);
       (_a = editorApis.current) === null || _a === void 0 ? void 0 : _a.setValue(content);
     } // reset as initial value on `null` received.
     else if (content === null) {
@@ -100,6 +102,7 @@ const ExerciseFileEditor = () => {
         var _a;
 
         if (typeof content === 'string') {
+          setExerciseMonacoEditorValueState(content);
           (_a = editorApis.current) === null || _a === void 0 ? void 0 : _a.setValue(content);
         } else {
           setFileResettable(false);
@@ -254,6 +257,8 @@ const ExerciseFileEditor = () => {
       return;
     }
 
+    setExerciseMonacoEditorValueState(wsUsercode.doc);
+
     _editorApis.setValue(wsUsercode.doc);
 
     pushEditorDocHistories();

package/es/components/material-exercise/exercise-runner/ExerciseRunner.js

@@ -10,7 +10,7 @@ import styled from 'styled-components';
 import XtermLazy from '../../shared/xterm/XtermLazy.js';
 import { MATERIAL_RESIZABLE_COMMON_PROPS } from '../../../constants/stylesheets.js';
 import { useArduino } from '../../../hooks/useArduino.js';
-import { exerciseState, exerciseEditorPreferenceState, exerciseRunnerSubmittingState, exerciseRunnerRunningState, exerciseRunnerRunTypeState, exerciseRunnerRoomConnectionInfoState, exerciseRunnerStdioFilesState, exercisePreviewTypeState, exercisePreviewDisplayModeState, exerciseWebsocketQuery, exerciseContainerSizeState } from '../context/recoil.js';
+import { exerciseState, exerciseEditorPreferenceState, exerciseRunnerSubmittingState, exerciseRunnerRunningState, exerciseRunnerRunTypeState, exerciseRunnerRoomConnectionInfoState, exerciseRunnerStdioFilesState, exercisePreviewTypeState, exercisePreviewDisplayModeState, exerciseMonacoEditorValueState, exerciseWebsocketQuery, exerciseContainerSizeState } from '../context/recoil.js';
 import { ExerciseContext } from '../context/context.js';
 import { ExercisePreviewType, ExercisePreviewDisplayMode } from '../context/recoilTypes.js';
 import { exerciseRunnerTextSend$ } from '../context/subjects.js';
@@ -71,16 +71,24 @@ const ExerciseRunner = ({
   const setRunnerStdioFilesState = useSetRecoilState(exerciseRunnerStdioFilesState); // preview states
 
   const exercisePreviewType = useRecoilValue(exercisePreviewTypeState(materialExerciseId));
-  const exercisePreviewDisplayMode = useRecoilValue(exercisePreviewDisplayModeState); // websockets
+  const exercisePreviewDisplayMode = useRecoilValue(exercisePreviewDisplayModeState); // monaco editor value
+
+  const getExerciseMonacoEditorValueState = useRecoilValue(exerciseMonacoEditorValueState); // websockets
 
   const setRunnerRoomWebSocketState = useSetRecoilState(exerciseWebsocketQuery('runnerRoom'));
   const setStdioWebSocketState = useSetRecoilState(exerciseWebsocketQuery('stdio'));
 
   const handleAiHelpibotError = text => {
+    var _a, _b;
+
     const error = getProgrammingErrorResult(text);
 
     if (!!error && typeof onCodeHelpRequest === 'function') {
-      onCodeHelpRequest(error.errorCode, error);
+      onCodeHelpRequest(error.errorCode, error, {
+        readme: (_a = exercise === null || exercise === void 0 ? void 0 : exercise.description) !== null && _a !== void 0 ? _a : '',
+        instruction: (_b = exercise === null || exercise === void 0 ? void 0 : exercise.instructionContent) !== null && _b !== void 0 ? _b : '',
+        openFileContent: getExerciseMonacoEditorValueState
+      });
     }
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elice/material-exercise",
-  "version": "1.230316.0",
+  "version": "1.230325.0",
   "description": "User view and editing components of Elice material exercise",
   "repository": "https://git.elicer.io/elice/frontend/library/elice-material",
   "license": "UNLICENSED",
@@ -79,8 +79,8 @@
     "@elice/design-tokens": "^1.220803.0",
     "@elice/icons": "^1.220803.0",
     "@elice/markdown": "^1.220803.0",
-    "@elice/material-shared-types": "1.230316.0",
-    "@elice/material-shared-utils": "1.230316.0",
+    "@elice/material-shared-types": "1.230325.0",
+    "@elice/material-shared-utils": "1.230325.0",
     "@elice/types": "^1.230306.0",
     "@elice/websocket": "^1.220803.0",
     "@types/classnames": "^2.3.1",
@@ -102,5 +102,5 @@
     "recoil": "^0.6.1",
     "styled-components": "^5.2.0"
   },
-  "gitHead": "afbe8701b9b8fc094459762caa92310c194929f1"
+  "gitHead": "8895c0015d03f16997ce78d5f25e22258ce609f8"
 }