@elice/material-exercise 1.240718.0-trasncript.2 → 1.240718.2

package/es/hooks/useUsercodeHistory.js

@@ -1,36 +1,20 @@
-import { slicedToArray as _slicedToArray, asyncToGenerator as _asyncToGenerator, regeneratorRuntime as _regeneratorRuntime, toConsumableArray as _toConsumableArray } from '../_virtual/_rollupPluginBabelHelpers.js';
 import { useRef, useState, useEffect } from 'react';
 import { useMount } from 'react-use';
 import { getOrgMaterialExerciseUsercodeGet, getOrgMaterialExerciseUsercodeOpList } from '@elice/api-client';
 import { type } from 'ot-text-unicode';
 
-var OP_FETCHING_COUNT = 100;
-var useUsercodeHistory = function useUsercodeHistory(exerciseRoomId, filename) {
-  var latestDocRef = useRef('');
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    ops = _useState2[0],
-    setOps = _useState2[1];
-  var _useState3 = useState(''),
-    _useState4 = _slicedToArray(_useState3, 2),
-    doc = _useState4[0],
-    setDoc = _useState4[1];
-  var _useState5 = useState(),
-    _useState6 = _slicedToArray(_useState5, 2),
-    version = _useState6[0],
-    setVersion = _useState6[1];
-  var _useState7 = useState(),
-    _useState8 = _slicedToArray(_useState7, 2),
-    latestVersion = _useState8[0],
-    setLatestVersion = _useState8[1];
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    hasMoreVersion = _useState10[0],
-    setHasMoreVersion = _useState10[1];
+const OP_FETCHING_COUNT = 100;
+const useUsercodeHistory = (exerciseRoomId, filename) => {
+  const latestDocRef = useRef('');
+  const [ops, setOps] = useState([]);
+  const [doc, setDoc] = useState('');
+  const [version, setVersion] = useState();
+  const [latestVersion, setLatestVersion] = useState();
+  const [hasMoreVersion, setHasMoreVersion] = useState(false);
   /**
    *
    */
-  var inverseApplyOp = function inverseApplyOp(doc, op) {
+  const inverseApplyOp = (doc, op) => {
     if (typeof type.invert !== 'function') {
       return doc;
     }
@@ -39,57 +23,34 @@ var useUsercodeHistory = function useUsercodeHistory(exerciseRoomId, filename) {
   /**
    *
    */
-  var applyOps = function applyOps(selectedVersion) {
+  const applyOps = selectedVersion => {
     if (!latestVersion) {
       return;
     }
-    setDoc(ops.slice(0, latestVersion - selectedVersion).reduce(function (newDoc, op) {
-      return inverseApplyOp(newDoc, op.ots);
-    }, latestDocRef.current));
+    setDoc(ops.slice(0, latestVersion - selectedVersion).reduce((newDoc, op) => inverseApplyOp(newDoc, op.ots), latestDocRef.current));
   };
   /**
    *
    */
-  var loadMoreVersions = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _yield$getOrgMaterial, newOps;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            if (filename) {
-              _context.next = 2;
-              break;
-            }
-            return _context.abrupt("return");
-          case 2:
-            _context.next = 4;
-            return getOrgMaterialExerciseUsercodeOpList({
-              exerciseRoomId: exerciseRoomId,
-              filename: filename,
-              offset: ops.length,
-              count: OP_FETCHING_COUNT,
-              isOpComposed: false
-            });
-          case 4:
-            _yield$getOrgMaterial = _context.sent;
-            newOps = _yield$getOrgMaterial.ops;
-            setOps(function (prev) {
-              return [].concat(_toConsumableArray(prev), _toConsumableArray(newOps));
-            });
-          case 7:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function loadMoreVersions() {
-      return _ref.apply(this, arguments);
-    };
-  }();
+  const loadMoreVersions = async () => {
+    if (!filename) {
+      return;
+    }
+    const {
+      ops: newOps
+    } = await getOrgMaterialExerciseUsercodeOpList({
+      exerciseRoomId,
+      filename,
+      offset: ops.length,
+      count: OP_FETCHING_COUNT,
+      isOpComposed: false
+    });
+    setOps(prev => [...prev, ...newOps]);
+  };
   /**
    *
    */
-  var changeVersion = function changeVersion(selectedVersion) {
+  const changeVersion = selectedVersion => {
     if (selectedVersion === version) {
       return;
     }
@@ -99,69 +60,56 @@ var useUsercodeHistory = function useUsercodeHistory(exerciseRoomId, filename) {
   //
   //
   //
-  useMount(function () {
+  useMount(() => {
     if (!filename) {
       return;
     }
-    void _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _yield$Promise$all, _yield$Promise$all2, usercode, _ops;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            _context2.prev = 0;
-            _context2.next = 3;
-            return Promise.all([getOrgMaterialExerciseUsercodeGet({
-              exerciseRoomId: exerciseRoomId,
-              filename: filename
-            }), getOrgMaterialExerciseUsercodeOpList({
-              exerciseRoomId: exerciseRoomId,
-              filename: filename,
-              offset: 0,
-              count: OP_FETCHING_COUNT,
-              isOpComposed: false
-            })]);
-          case 3:
-            _yield$Promise$all = _context2.sent;
-            _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 2);
-            usercode = _yield$Promise$all2[0].usercode;
-            _ops = _yield$Promise$all2[1].ops;
-            latestDocRef.current = usercode.content;
-            setDoc(usercode.content);
-            setOps(_ops);
-            setVersion(_ops[0].version);
-            setLatestVersion(_ops[0].version);
-            if (_ops.length < _ops[0].version) {
-              setHasMoreVersion(true);
-            }
-            _context2.next = 17;
-            break;
-          case 15:
-            _context2.prev = 15;
-            _context2.t0 = _context2["catch"](0);
-          case 17:
-          case "end":
-            return _context2.stop();
+    void (async () => {
+      try {
+        const [{
+          usercode
+        }, {
+          ops
+        }] = await Promise.all([getOrgMaterialExerciseUsercodeGet({
+          exerciseRoomId,
+          filename
+        }), getOrgMaterialExerciseUsercodeOpList({
+          exerciseRoomId,
+          filename,
+          offset: 0,
+          count: OP_FETCHING_COUNT,
+          isOpComposed: false
+        })]);
+        latestDocRef.current = usercode.content;
+        setDoc(usercode.content);
+        setOps(ops);
+        setVersion(ops[0].version);
+        setLatestVersion(ops[0].version);
+        if (ops.length < ops[0].version) {
+          setHasMoreVersion(true);
         }
-      }, _callee2, null, [[0, 15]]);
-    }))();
+      } catch (_) {
+        //
+      }
+    })();
   });
   //
   //
   //
-  useEffect(function () {
+  useEffect(() => {
     setHasMoreVersion(latestVersion !== undefined && ops.length < latestVersion);
   }, [latestVersion, ops]);
   //
   //
   //
   return {
-    doc: doc,
-    ops: ops,
-    version: version,
-    latestVersion: latestVersion,
-    hasMoreVersion: hasMoreVersion,
-    changeVersion: changeVersion,
-    loadMoreVersions: loadMoreVersions
+    doc,
+    ops,
+    version,
+    latestVersion,
+    hasMoreVersion,
+    changeVersion,
+    loadMoreVersions
   };
 };
 

package/es/utils/arduino.js

@@ -1,11 +1,10 @@
-import { createForOfIteratorHelper as _createForOfIteratorHelper } from '../_virtual/_rollupPluginBabelHelpers.js';
-import { ARDUINO_BOARD_FQBN, ARDUINO_VENDOR_PRODUCT_IDS, ARDUINO_BOARD_NAMES } from '../constants/arduino.js';
+import { ARDUINO_BOARD_NAMES, ARDUINO_BOARD_FQBN, ARDUINO_VENDOR_PRODUCT_IDS } from '../constants/arduino.js';
 
 /**
  * Create url to communicate with arduino.
  */
 function createArduinoUrl(options) {
-  var url = new URL("".concat(options.protocol, "://127.0.0.1"));
+  const url = new URL(`${options.protocol}://127.0.0.1`);
   if (options.pathname) {
     url.pathname = options.pathname;
   }
@@ -18,21 +17,12 @@ function createArduinoUrl(options) {
  *
  */
 function getArduinoBoardType(port) {
-  var boards = ARDUINO_VENDOR_PRODUCT_IDS;
-  for (var board in boards) {
-    var _iterator = _createForOfIteratorHelper(boards[board]),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var pair = _step.value;
-        if (pair.vendorId === port.VendorID && pair.productId === port.ProductID) {
-          return board;
-        }
+  const boards = ARDUINO_VENDOR_PRODUCT_IDS;
+  for (const board in boards) {
+    for (const pair of boards[board]) {
+      if (pair.vendorId === port.VendorID && pair.productId === port.ProductID) {
+        return board;
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
     }
   }
   return null;
@@ -41,8 +31,8 @@ function getArduinoBoardType(port) {
  *
  */
 function getDisplayName(port) {
-  var type = getArduinoBoardType(port);
-  var displayName = type !== null && Object.keys(ARDUINO_BOARD_NAMES).includes(type) ? "".concat(ARDUINO_BOARD_NAMES[type]) : "Unsupported Device";
+  const type = getArduinoBoardType(port);
+  const displayName = type !== null && Object.keys(ARDUINO_BOARD_NAMES).includes(type) ? `${ARDUINO_BOARD_NAMES[type]}` : `Unsupported Device`;
   return displayName;
 }
 /**
@@ -50,22 +40,20 @@ function getDisplayName(port) {
  */
 function getPortFromName(ports, name) {
   var _a;
-  return (_a = ports.filter(function (port) {
-    return port.Name === name;
-  })[0]) !== null && _a !== void 0 ? _a : null;
+  return (_a = ports.filter(port => port.Name === name)[0]) !== null && _a !== void 0 ? _a : null;
 }
 /**
  *
  */
 function getFileContent(encoded) {
-  var file = encoded.split(',');
+  const file = encoded.split(',');
   return file[1];
 }
 /**
  *
  */
 function getFQBN(device) {
-  var type = getArduinoBoardType(device);
+  const type = getArduinoBoardType(device);
   if (type) {
     return ARDUINO_BOARD_FQBN[type];
   }

package/es/utils/exerciseFile.js

@@ -24,9 +24,10 @@
 /**
  * Check whether the exercise file is editable.
  */
-var checkExerciseFileEditable = function checkExerciseFileEditable(filename, _ref) {
-  var exercise = _ref.exercise,
-    exerciseRoom = _ref.exerciseRoom;
+const checkExerciseFileEditable = (filename, {
+  exercise,
+  exerciseRoom
+}) => {
   var _a;
   if (!filename) {
     return false;
@@ -36,16 +37,17 @@ var checkExerciseFileEditable = function checkExerciseFileEditable(filename, _re
 /**
  * Check whether the exercise file is resettable.
  */
-var checkExerciseFileResettable = function checkExerciseFileResettable(filename, _ref2) {
-  var exercise = _ref2.exercise,
-    exerciseRoom = _ref2.exerciseRoom;
+const checkExerciseFileResettable = (filename, {
+  exercise,
+  exerciseRoom
+}) => {
   var _a, _b, _c;
   if (!filename) {
     return false;
   }
   return [checkExerciseFileEditable(filename, {
-    exercise: exercise,
-    exerciseRoom: exerciseRoom
+    exercise,
+    exerciseRoom
   }), (_a = exercise === null || exercise === void 0 ? void 0 : exercise.readyExerciseImage) === null || _a === void 0 ? void 0 : _a.taskFilelist.includes(filename), !((_b = exercise === null || exercise === void 0 ? void 0 : exercise.readyExerciseImage) === null || _b === void 0 ? void 0 : _b.readOnlyFilelist.includes(filename)), !((_c = exercise === null || exercise === void 0 ? void 0 : exercise.readyExerciseImage) === null || _c === void 0 ? void 0 : _c.hiddenFilelist.includes(filename))].every(Boolean);
 };
 

package/es/utils/runner.js

@@ -2,82 +2,66 @@
 // This logic is based on the following spreadsheet.
 // https://docs.google.com/spreadsheets/d/1AeIf1eIlxp2MFR5hZijr-s304xVHMdtuAzcODS6nL-g/edit#gid=0
 //
-var PythonRuntimeErrorRegex = new RegExp(/Traceback \(most recent call last\):\n\s*File "\S+", line \d+, in \S+\n\s*.*\n(.+\n)*\S+Error:\s.+/gm);
-var PythonSyntaxErrorRegex = new RegExp(/File "(.*?)", line (\d+)\n\s*.+\n\s*(\^+)\n(.+)Error:\s(.+)/gm);
-var CCCPCompileErrorRegex = new RegExp(/(.*?):(\d+):(\d+):\s+(warning|error|note):\s+(.*)(\n.+\n.+)?/gm);
-var CCCPSyntaxCompileErrorRegex = new RegExp(/(.*?\.cpp.*?)+error:\s+(.*)?/gm);
-var CCCPRuntimeErrorRegex = new RegExp(/(\w+ fault)\s+\(.*\)/gm);
-var JavaCompileErrorRegex = new RegExp(/(.*?):(\d+):\s+error:\s+(.*)\n.+\n.+(\n\s*symbol.+)?(\n\s*location.+)?/gm);
-var JavaRuntimeErrorRegex = new RegExp(/^Exception in thread ".+" (.+)$\n((?:\s+at .+$\n)+)/gm);
-var JavascriptRuntimeErrorRegex = new RegExp(/(Uncaught )?(\w+Error):\s+(.*)\n((?:\s+at .+$\n)+)/gm);
+const PythonRuntimeErrorRegex = new RegExp(/Traceback \(most recent call last\):\n\s*File "\S+", line \d+, in \S+\n\s*.*\n(.+\n)*\S+Error:\s.+/gm);
+const PythonSyntaxErrorRegex = new RegExp(/File "(.*?)", line (\d+)\n\s*.+\n\s*(\^+)\n(.+)Error:\s(.+)/gm);
+const CCCPCompileErrorRegex = new RegExp(/(.*?):(\d+):(\d+):\s+(warning|error|note):\s+(.*)(\n.+\n.+)?/gm);
+const CCCPSyntaxCompileErrorRegex = new RegExp(/(.*?\.cpp.*?)+error:\s+(.*)?/gm);
+const CCCPRuntimeErrorRegex = new RegExp(/(\w+ fault)\s+\(.*\)/gm);
+const JavaCompileErrorRegex = new RegExp(/(.*?):(\d+):\s+error:\s+(.*)\n.+\n.+(\n\s*symbol.+)?(\n\s*location.+)?/gm);
+const JavaRuntimeErrorRegex = new RegExp(/^Exception in thread ".+" (.+)$\n((?:\s+at .+$\n)+)/gm);
+const JavascriptRuntimeErrorRegex = new RegExp(/(Uncaught )?(\w+Error):\s+(.*)\n((?:\s+at .+$\n)+)/gm);
 /**
  * Get Programming Error Results from text.
  */
 function getProgrammingErrorResult(text) {
   var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-  var escapedText = text.replace(/[\r|\\]/gm, '');
+  const escapedText = text.replace(/[\r|\\]/gm, '');
   switch (true) {
     case PythonRuntimeErrorRegex.test(escapedText):
       return {
-        errorCode: (_b = (_a = escapedText.match(PythonRuntimeErrorRegex)) === null || _a === void 0 ? void 0 : _a.reduce(function (acc, curr) {
-          return acc + '\n' + curr;
-        })) !== null && _b !== void 0 ? _b : '',
+        errorCode: (_b = (_a = escapedText.match(PythonRuntimeErrorRegex)) === null || _a === void 0 ? void 0 : _a.reduce((acc, curr) => acc + '\n' + curr)) !== null && _b !== void 0 ? _b : '',
         errorLangType: 'python',
         errorType: 'runtime'
       };
     case PythonSyntaxErrorRegex.test(escapedText):
       return {
-        errorCode: (_d = (_c = escapedText.match(PythonSyntaxErrorRegex)) === null || _c === void 0 ? void 0 : _c.reduce(function (acc, curr) {
-          return acc + '\n' + curr;
-        })) !== null && _d !== void 0 ? _d : '',
+        errorCode: (_d = (_c = escapedText.match(PythonSyntaxErrorRegex)) === null || _c === void 0 ? void 0 : _c.reduce((acc, curr) => acc + '\n' + curr)) !== null && _d !== void 0 ? _d : '',
         errorLangType: 'python',
         errorType: 'syntax'
       };
     case CCCPCompileErrorRegex.test(escapedText):
       return {
-        errorCode: (_f = (_e = escapedText.match(CCCPCompileErrorRegex)) === null || _e === void 0 ? void 0 : _e.reduce(function (acc, curr) {
-          return acc + '\n' + curr;
-        })) !== null && _f !== void 0 ? _f : '',
+        errorCode: (_f = (_e = escapedText.match(CCCPCompileErrorRegex)) === null || _e === void 0 ? void 0 : _e.reduce((acc, curr) => acc + '\n' + curr)) !== null && _f !== void 0 ? _f : '',
         errorLangType: 'c/cpp',
         errorType: 'compile'
       };
     case CCCPSyntaxCompileErrorRegex.test(escapedText):
       return {
-        errorCode: (_h = (_g = escapedText.match(CCCPSyntaxCompileErrorRegex)) === null || _g === void 0 ? void 0 : _g.reduce(function (acc, curr) {
-          return acc + '\n' + curr;
-        })) !== null && _h !== void 0 ? _h : '',
+        errorCode: (_h = (_g = escapedText.match(CCCPSyntaxCompileErrorRegex)) === null || _g === void 0 ? void 0 : _g.reduce((acc, curr) => acc + '\n' + curr)) !== null && _h !== void 0 ? _h : '',
         errorLangType: 'c/cpp',
         errorType: 'compile'
       };
     case CCCPRuntimeErrorRegex.test(escapedText):
       return {
-        errorCode: (_k = (_j = escapedText.match(CCCPRuntimeErrorRegex)) === null || _j === void 0 ? void 0 : _j.reduce(function (acc, curr) {
-          return acc + '\n' + curr;
-        })) !== null && _k !== void 0 ? _k : '',
+        errorCode: (_k = (_j = escapedText.match(CCCPRuntimeErrorRegex)) === null || _j === void 0 ? void 0 : _j.reduce((acc, curr) => acc + '\n' + curr)) !== null && _k !== void 0 ? _k : '',
         errorLangType: 'c/cpp',
         errorType: 'runtime'
       };
     case JavaCompileErrorRegex.test(escapedText):
       return {
-        errorCode: (_m = (_l = escapedText.match(JavaCompileErrorRegex)) === null || _l === void 0 ? void 0 : _l.reduce(function (acc, curr) {
-          return acc + '\n' + curr;
-        })) !== null && _m !== void 0 ? _m : '',
+        errorCode: (_m = (_l = escapedText.match(JavaCompileErrorRegex)) === null || _l === void 0 ? void 0 : _l.reduce((acc, curr) => acc + '\n' + curr)) !== null && _m !== void 0 ? _m : '',
         errorLangType: 'java',
         errorType: 'compile'
       };
     case JavaRuntimeErrorRegex.test(escapedText):
       return {
-        errorCode: (_p = (_o = escapedText.match(JavaRuntimeErrorRegex)) === null || _o === void 0 ? void 0 : _o.reduce(function (acc, curr) {
-          return acc + '\n' + curr;
-        })) !== null && _p !== void 0 ? _p : '',
+        errorCode: (_p = (_o = escapedText.match(JavaRuntimeErrorRegex)) === null || _o === void 0 ? void 0 : _o.reduce((acc, curr) => acc + '\n' + curr)) !== null && _p !== void 0 ? _p : '',
         errorLangType: 'java',
         errorType: 'runtime'
       };
     case JavascriptRuntimeErrorRegex.test(escapedText):
       return {
-        errorCode: (_r = (_q = escapedText.match(JavascriptRuntimeErrorRegex)) === null || _q === void 0 ? void 0 : _q.reduce(function (acc, curr) {
-          return acc + '\n' + curr;
-        })) !== null && _r !== void 0 ? _r : '',
+        errorCode: (_r = (_q = escapedText.match(JavascriptRuntimeErrorRegex)) === null || _q === void 0 ? void 0 : _q.reduce((acc, curr) => acc + '\n' + curr)) !== null && _r !== void 0 ? _r : '',
         errorLangType: 'javascript',
         errorType: 'runtime'
       };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elice/material-exercise",
-  "version": "1.240718.0-trasncript.2",
+  "version": "1.240718.2",
   "description": "User view and editing components of Elice material exercise",
   "repository": "https://git.elicer.io/elice/frontend/library/elice-material",
   "license": "UNLICENSED",
@@ -17,8 +17,10 @@
   "scripts": {
     "start": "run-s watch",
     "prebuild": "run-s clean",
-    "build": "cross-env NODE_ENV=production rollup -c ../../rollup.config.ts --configPlugin typescript -f es -f cjs",
-    "watch": "rollup -c ../../rollup.config.ts --configPlugin typescript -f es -f cjs -w",
+    "build": "run-p build:es build:cjs",
+    "build:es": "rollup -c ../../rollup.config.ts --configPlugin typescript -f es",
+    "build:cjs": "rollup -c ../../rollup.config.ts --configPlugin typescript -f cjs",
+    "watch": "rollup -c ../../rollup.config.ts --configPlugin typescript -f es -w",
     "lint": "eslint --ext .ts,.tsx ./src --max-warnings=0",
     "clean": "del-cli \"es/*\" \"cjs/*\" \"dist/*\""
   },
@@ -46,6 +48,7 @@
     "lodash": "^4.17.21",
     "react": "^16.8.0  || ^17.0.0 || ^18.0.0",
     "react-use": "^17.0.0",
+    "recoil": "^0.6.1",
     "styled-components": "^5.2.0"
   },
   "dependencies": {
@@ -66,7 +69,6 @@
     "random-words": "^1.1.2",
     "react-hook-form": "~7.45.4",
     "react-transition-group": "^4.3.0",
-    "recoil": "~0.7.3",
     "rxjs": "^7.5.6",
     "socket.io-client": "2.3.1",
     "tslib": "^2.6.1",
@@ -78,15 +80,15 @@
   },
   "devDependencies": {
     "@elice/api-client": "^1.240619.0",
-    "@elice/blocks": "^1.240529.0",
+    "@elice/blocks": "^1.240514.0",
     "@elice/design-tokens": "^1.220803.0",
     "@elice/icons": "^1.230814.0",
     "@elice/intl": "0.240425.0-rc.2",
-    "@elice/markdown": "^1.240124.0",
-    "@elice/material-shared-types": "1.240718.0-trasncript.2",
-    "@elice/material-shared-utils": "1.240718.0-trasncript.2",
-    "@elice/mui-elements": "^5.231130.0",
-    "@elice/mui-system": "^5.240108.1",
+    "@elice/markdown": "^1.220815.0",
+    "@elice/material-shared-types": "1.240718.2",
+    "@elice/material-shared-utils": "1.240718.2",
+    "@elice/mui-elements": "^5.230825.0",
+    "@elice/mui-system": "^5.230825.0",
     "@elice/types": "1.240709.0",
     "@elice/websocket": "^1.220815.0",
     "@emotion/react": "^11.10.5",
@@ -111,6 +113,8 @@
     "lodash": "^4.17.21",
     "react": "^17.0.2",
     "react-use": "^17.0.0",
+    "recoil": "^0.6.1",
     "styled-components": "^5.2.0"
-  }
+  },
+  "gitHead": "cd595d8015f44aa8518f22e37b7d2fb981a2b71d"
 }