@elice/material-shared-utils 1.231227.0 → 1.231228.0

package/es/material-config/MaterialConfigProvider.js

@@ -1,33 +1,24 @@
-import { slicedToArray as _slicedToArray } from '../_virtual/_rollupPluginBabelHelpers.js';
 import React from 'react';
 import { sessionKeySubject$, MaterialConfigContext } from './MaterialConfigContext.js';
 
-var MaterialConfigProvider = function MaterialConfigProvider(_ref) {
-  var children = _ref.children,
-    apiOriginUrl = _ref.apiOriginUrl,
-    apiWsOriginUrl = _ref.apiWsOriginUrl,
-    _ref$orgNameShort = _ref.orgNameShort,
-    orgNameShortProp = _ref$orgNameShort === void 0 ? 'academy' : _ref$orgNameShort;
-  var _React$useState = React.useState(orgNameShortProp),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    orgNameShort = _React$useState2[0],
-    setOrgNameShort = _React$useState2[1];
-  var _React$useState3 = React.useState(null),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    sessionKey = _React$useState4[0],
-    setSessionKey = _React$useState4[1];
+const MaterialConfigProvider = ({
+  children,
+  apiOriginUrl,
+  apiWsOriginUrl,
+  orgNameShort: orgNameShortProp = 'academy'
+}) => {
+  const [orgNameShort, setOrgNameShort] = React.useState(orgNameShortProp);
+  const [sessionKey, setSessionKey] = React.useState(null);
   //
   // Update org name short.
   //
-  React.useEffect(function () {
-    return setOrgNameShort(orgNameShortProp);
-  }, [orgNameShortProp]);
+  React.useEffect(() => setOrgNameShort(orgNameShortProp), [orgNameShortProp]);
   //
   // Update session key when session key subject emits.
   //
-  React.useEffect(function () {
-    var sub = sessionKeySubject$.subscribe(setSessionKey);
-    return function () {
+  React.useEffect(() => {
+    const sub = sessionKeySubject$.subscribe(setSessionKey);
+    return () => {
       sub.unsubscribe();
     };
   }, []);
@@ -37,10 +28,10 @@ var MaterialConfigProvider = function MaterialConfigProvider(_ref) {
   return React.createElement(MaterialConfigContext.Provider, {
     children: children,
     value: {
-      apiOriginUrl: apiOriginUrl,
-      apiWsOriginUrl: apiWsOriginUrl,
-      orgNameShort: orgNameShort,
-      sessionKey: sessionKey
+      apiOriginUrl,
+      apiWsOriginUrl,
+      orgNameShort,
+      sessionKey
     }
   });
 };

package/es/material-config/useMaterialConfig.js

@@ -1,8 +1,8 @@
 import { useContext } from 'react';
 import { MaterialConfigContext } from './MaterialConfigContext.js';
 
-var useMaterialConfig = function useMaterialConfig() {
-  var context = useContext(MaterialConfigContext);
+const useMaterialConfig = () => {
+  const context = useContext(MaterialConfigContext);
   if (context === undefined) {
     throw new Error('Oops, `useMaterialConfig` must be used within a `MaterialConfigProvider`');
   }

package/es/material-config/useMaterialConfigApiClientUpdate.js

@@ -1,18 +1,14 @@
-import { slicedToArray as _slicedToArray } from '../_virtual/_rollupPluginBabelHelpers.js';
 import { useContext, useState } from 'react';
 import { useDeepCompareEffect } from 'react-use';
 import { MaterialConfigContext } from './MaterialConfigContext.js';
 
-var useMaterialConfigApiClientUpdate = function useMaterialConfigApiClientUpdate(callback) {
-  var context = useContext(MaterialConfigContext);
+const useMaterialConfigApiClientUpdate = callback => {
+  const context = useContext(MaterialConfigContext);
   if (!context) {
     throw new Error('Oops, Elice material component must be used within a `MaterialConfigProvider`');
   }
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    isReady = _useState2[0],
-    setReady = _useState2[1];
-  useDeepCompareEffect(function () {
+  const [isReady, setReady] = useState(false);
+  useDeepCompareEffect(() => {
     var _a;
     callback({
       apiBaseUrl: context.apiOriginUrl,

package/es/material-fetch/useMaterialFetch.js

@@ -24,8 +24,8 @@ import { useMaterialFetchRaw } from './useMaterialFetchRaw.js';
  *     eliceApiClientConfigs.init
  *   );
  */
-var useMaterialFetch = function useMaterialFetch(materialType, materialFetchFn, init) {
-  var isReady = useMaterialConfigApiClientUpdate(init);
+const useMaterialFetch = (materialType, materialFetchFn, init) => {
+  const isReady = useMaterialConfigApiClientUpdate(init);
   return useMaterialFetchRaw(materialType, materialFetchFn, isReady);
 };
 

package/es/material-fetch/useMaterialFetchRaw.js

@@ -1,10 +1,23 @@
-import { defineProperty as _defineProperty, slicedToArray as _slicedToArray, asyncToGenerator as _asyncToGenerator, regeneratorRuntime as _regeneratorRuntime } from '../_virtual/_rollupPluginBabelHelpers.js';
 import { useRef, useState, useCallback, useEffect } from 'react';
 import { getOrgLecturePageResolve, getOrgLecturePageGet } from '@elice/api-client';
 import { enums } from '@elice/types';
 
-var _Object$freeze;
-var MATERIAL_FETCH_KEY_MAP = Object.freeze((_Object$freeze = {}, _defineProperty(_Object$freeze, enums.LectureMaterialType.Nothing, 'materialNothing'), _defineProperty(_Object$freeze, enums.LectureMaterialType.Note, 'materialNote'), _defineProperty(_Object$freeze, enums.LectureMaterialType.Video, 'materialVideo'), _defineProperty(_Object$freeze, enums.LectureMaterialType.PDF, 'materialPdf'), _defineProperty(_Object$freeze, enums.LectureMaterialType.Exercise, 'materialExercise'), _defineProperty(_Object$freeze, enums.LectureMaterialType.Quiz, 'materialQuiz'), _defineProperty(_Object$freeze, enums.LectureMaterialType.LegacyRunbox, 'materialLegacyRunbox'), _defineProperty(_Object$freeze, enums.LectureMaterialType.VideoFile, 'materialVideoFile'), _defineProperty(_Object$freeze, enums.LectureMaterialType.Live, 'materialLive'), _defineProperty(_Object$freeze, enums.LectureMaterialType.Assignment, 'materialAssignment'), _defineProperty(_Object$freeze, enums.LectureMaterialType.LMSPublicContent, 'materialLmsPublicContent'), _defineProperty(_Object$freeze, enums.LectureMaterialType.External, 'materialExternal'), _defineProperty(_Object$freeze, enums.LectureMaterialType.Survey, 'materialSurvey'), _defineProperty(_Object$freeze, enums.LectureMaterialType.Runbox, 'materialRunbox'), _Object$freeze));
+const MATERIAL_FETCH_KEY_MAP = Object.freeze({
+  [enums.LectureMaterialType.Nothing]: 'materialNothing',
+  [enums.LectureMaterialType.Note]: 'materialNote',
+  [enums.LectureMaterialType.Video]: 'materialVideo',
+  [enums.LectureMaterialType.PDF]: 'materialPdf',
+  [enums.LectureMaterialType.Exercise]: 'materialExercise',
+  [enums.LectureMaterialType.Quiz]: 'materialQuiz',
+  [enums.LectureMaterialType.LegacyRunbox]: 'materialLegacyRunbox',
+  [enums.LectureMaterialType.VideoFile]: 'materialVideoFile',
+  [enums.LectureMaterialType.Live]: 'materialLive',
+  [enums.LectureMaterialType.Assignment]: 'materialAssignment',
+  [enums.LectureMaterialType.LMSPublicContent]: 'materialLmsPublicContent',
+  [enums.LectureMaterialType.External]: 'materialExternal',
+  [enums.LectureMaterialType.Survey]: 'materialSurvey',
+  [enums.LectureMaterialType.Runbox]: 'materialRunbox'
+});
 //
 //
 //
@@ -26,85 +39,54 @@ var MATERIAL_FETCH_KEY_MAP = Object.freeze((_Object$freeze = {}, _defineProperty
  *     isReady // boolean
  *   );
  */
-var useMaterialFetchRaw = function useMaterialFetchRaw(materialType, materialFetchFn) {
-  var isReady = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  var _return = useRef({});
-  var materialKey = MATERIAL_FETCH_KEY_MAP[materialType];
-  var _createEmptyFetchRes = function _createEmptyFetchRes() {
-    var _ref;
-    return _ref = {}, _defineProperty(_ref, materialKey, null), _defineProperty(_ref, "materialLecturePage", null), _ref;
-  };
-  var _useState = useState(_createEmptyFetchRes),
-    _useState2 = _slicedToArray(_useState, 2),
-    matFetchRes = _useState2[0],
-    setMatFetchRes = _useState2[1];
-  var _useState3 = useState('idle'),
-    _useState4 = _slicedToArray(_useState3, 2),
-    matFetchStatus = _useState4[0],
-    setMatFetchStatus = _useState4[1];
+const useMaterialFetchRaw = (materialType, materialFetchFn, isReady = true) => {
+  const _return = useRef({});
+  const materialKey = MATERIAL_FETCH_KEY_MAP[materialType];
+  const _createEmptyFetchRes = () => ({
+    [materialKey]: null,
+    materialLecturePage: null
+  });
+  const [matFetchRes, setMatFetchRes] = useState(_createEmptyFetchRes);
+  const [matFetchStatus, setMatFetchStatus] = useState('idle');
   /**
    * fetch material and lecture page
    */
-  var fetch = useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(signal) {
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            setMatFetchStatus('pending');
-            return _context.abrupt("return", materialFetchFn(signal).then(function (resMaterialGet) {
-              return resMaterialGet[materialKey];
-            }).then(function (material) {
-              return Promise.all([material, getOrgLecturePageResolve({
-                materialId: material.id,
-                materialType: materialType
-              }, {
-                signal: signal
-              }).then(function (resLecturePageResolve) {
-                return getOrgLecturePageGet({
-                  lecturePageId: resLecturePageResolve.lecturePageId
-                }, {
-                  signal: signal
-                });
-              }).then(function (resLecturePageGet) {
-                return resLecturePageGet.lecturePage;
-              })]);
-            }).then(function (_ref3) {
-              var _setMatFetchRes;
-              var _ref4 = _slicedToArray(_ref3, 2),
-                material = _ref4[0],
-                materialLecturePage = _ref4[1];
-              setMatFetchRes((_setMatFetchRes = {}, _defineProperty(_setMatFetchRes, materialKey, material), _defineProperty(_setMatFetchRes, "materialLecturePage", materialLecturePage), _setMatFetchRes));
-              setMatFetchStatus('resolved');
-            }).catch(function (err) {
-              if (err.name !== 'AbortError') {
-                setMatFetchRes(_createEmptyFetchRes);
-                setMatFetchStatus('rejected');
-              }
-            }));
-          case 2:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function (_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }(),
+  const fetch = useCallback(async signal => {
+    setMatFetchStatus('pending');
+    return materialFetchFn(signal).then(resMaterialGet => resMaterialGet[materialKey]).then(material => Promise.all([material, getOrgLecturePageResolve({
+      materialId: material.id,
+      materialType
+    }, {
+      signal: signal
+    }).then(resLecturePageResolve => getOrgLecturePageGet({
+      lecturePageId: resLecturePageResolve.lecturePageId
+    }, {
+      signal: signal
+    })).then(resLecturePageGet => resLecturePageGet.lecturePage)])).then(([material, materialLecturePage]) => {
+      setMatFetchRes({
+        [materialKey]: material,
+        materialLecturePage
+      });
+      setMatFetchStatus('resolved');
+    }).catch(err => {
+      if (err.name !== 'AbortError') {
+        setMatFetchRes(_createEmptyFetchRes);
+        setMatFetchStatus('rejected');
+      }
+    });
+  },
   // eslint-disable-next-line react-hooks/exhaustive-deps
   [materialKey, materialFetchFn]);
   //
   // emit `fetch` when `isReady` is changed
   //
-  useEffect(function () {
+  useEffect(() => {
     if (!isReady) {
       return;
     }
-    var abortCtrl = new AbortController();
-    fetch(abortCtrl.signal).catch(function () {
-      return void 0;
-    });
-    return function () {
+    const abortCtrl = new AbortController();
+    fetch(abortCtrl.signal).catch(() => void 0);
+    return () => {
       abortCtrl.abort();
     };
   },

package/es/material-hoc/withMaterial.js

@@ -15,11 +15,10 @@ import { useMaterialConfigApiClientUpdate } from '../material-config/useMaterial
  * - `<RecoilRoot />`
  * - `<IntlProvider />`
  */
-var withMaterial = function withMaterial(Component, eliceApiClientConfigInit) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  return function (props) {
+const withMaterial = (Component, eliceApiClientConfigInit, options = {}) => {
+  return props => {
     var _a;
-    var isReady = useMaterialConfigApiClientUpdate(eliceApiClientConfigInit);
+    const isReady = useMaterialConfigApiClientUpdate(eliceApiClientConfigInit);
     // do not render component, if material config is not ready
     if (!isReady) {
       return React.createElement(Flex, {
@@ -46,11 +45,10 @@ var withMaterial = function withMaterial(Component, eliceApiClientConfigInit) {
  * - `<RecoilRoot />`
  * - `<IntlProvider />`
  */
-var withForwardRefMaterial = function withForwardRefMaterial(Component, eliceApiClientConfigInit) {
-  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  return forwardRef(function (props, ref) {
+const withForwardRefMaterial = (Component, eliceApiClientConfigInit, options = {}) => {
+  return forwardRef((props, ref) => {
     var _a;
-    var isReady = useMaterialConfigApiClientUpdate(eliceApiClientConfigInit);
+    const isReady = useMaterialConfigApiClientUpdate(eliceApiClientConfigInit);
     // do not render component, if material config is not ready
     if (!isReady) {
       return React.createElement(Flex, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elice/material-shared-utils",
-  "version": "1.231227.0",
+  "version": "1.231228.0",
   "description": "Shared typings for elice material projects",
   "repository": "https://git.elicer.io/elice/frontend/library/elice-material",
   "license": "UNLICENSED",
@@ -18,9 +18,9 @@
     "start": "run-s watch",
     "prebuild": "run-s clean",
     "build": "run-p build:es build:cjs",
-    "build:es": "rollup -c ../../rollup.config.ts -f es",
-    "build:cjs": "rollup -c ../../rollup.config.ts -f cjs",
-    "watch": "rollup -c ../../rollup.config.ts -f es -w",
+    "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/*\""
   },
@@ -37,11 +37,11 @@
   },
   "devDependencies": {
     "@elice/api-client": "^1.230815.0",
-    "@elice/material-shared-types": "1.231227.0",
+    "@elice/material-shared-types": "1.231228.0",
     "@elice/types": "^1.230815.0",
     "@types/lodash-es": "^4.17.6",
     "@types/react": "~17.0.9",
     "react-use": "^17.2.4"
   },
-  "gitHead": "9c84854123a8e6ae3a8d734e3bc9b944bf20d924"
+  "gitHead": "98c3e4d64847cdbe7985f8fd95835bb01f1d53ca"
 }