@pie-element/multiple-choice 9.19.2-next.5 → 9.19.2-next.74

package/module/controller.js

@@ -94,11 +94,11 @@ var _root = root$8;
 var root$7 = _root;
 
 /** Built-in value references. */
-var Symbol$5 = root$7.Symbol;
+var Symbol$4 = root$7.Symbol;
 
-var _Symbol = Symbol$5;
+var _Symbol = Symbol$4;
 
-var Symbol$4 = _Symbol;
+var Symbol$3 = _Symbol;
 
 /** Used for built-in method references. */
 var objectProto$a = Object.prototype;
@@ -114,7 +114,7 @@ var hasOwnProperty$8 = objectProto$a.hasOwnProperty;
 var nativeObjectToString$1 = objectProto$a.toString;
 
 /** Built-in value references. */
-var symToStringTag$1 = Symbol$4 ? Symbol$4.toStringTag : undefined;
+var symToStringTag$1 = Symbol$3 ? Symbol$3.toStringTag : undefined;
 
 /**
  * A specialized version of `baseGetTag` which ignores `Symbol.toStringTag` values.
@@ -169,7 +169,7 @@ function objectToString$1(value) {
 
 var _objectToString = objectToString$1;
 
-var Symbol$3 = _Symbol,
+var Symbol$2 = _Symbol,
     getRawTag = _getRawTag,
     objectToString = _objectToString;
 
@@ -178,7 +178,7 @@ var nullTag = '[object Null]',
     undefinedTag = '[object Undefined]';
 
 /** Built-in value references. */
-var symToStringTag = Symbol$3 ? Symbol$3.toStringTag : undefined;
+var symToStringTag = Symbol$2 ? Symbol$2.toStringTag : undefined;
 
 /**
  * The base implementation of `getTag` without fallbacks for buggy environments.
@@ -442,15 +442,15 @@ var getNative$1 = _getNative,
     root$1 = _root;
 
 /* Built-in method references that are verified to be native. */
-var WeakMap$2 = getNative$1(root$1, 'WeakMap');
+var WeakMap$1 = getNative$1(root$1, 'WeakMap');
 
-var _WeakMap = WeakMap$2;
+var _WeakMap = WeakMap$1;
 
 var DataView = _DataView,
     Map$2 = _Map,
     Promise$1 = _Promise,
     Set = _Set,
-    WeakMap$1 = _WeakMap,
+    WeakMap = _WeakMap,
     baseGetTag$3 = _baseGetTag,
     toSource = _toSource;
 
@@ -468,7 +468,7 @@ var dataViewCtorString = toSource(DataView),
     mapCtorString = toSource(Map$2),
     promiseCtorString = toSource(Promise$1),
     setCtorString = toSource(Set),
-    weakMapCtorString = toSource(WeakMap$1);
+    weakMapCtorString = toSource(WeakMap);
 
 /**
  * Gets the `toStringTag` of `value`.
@@ -484,7 +484,7 @@ if ((DataView && getTag$2(new DataView(new ArrayBuffer(1))) != dataViewTag$2) ||
     (Map$2 && getTag$2(new Map$2) != mapTag$3) ||
     (Promise$1 && getTag$2(Promise$1.resolve()) != promiseTag) ||
     (Set && getTag$2(new Set) != setTag$3) ||
-    (WeakMap$1 && getTag$2(new WeakMap$1) != weakMapTag$1)) {
+    (WeakMap && getTag$2(new WeakMap) != weakMapTag$1)) {
   getTag$2 = function(value) {
     var result = baseGetTag$3(value),
         Ctor = result == objectTag$2 ? value.constructor : undefined,
@@ -1870,7 +1870,7 @@ function setToArray$1(set) {
 
 var _setToArray = setToArray$1;
 
-var Symbol$2 = _Symbol,
+var Symbol$1 = _Symbol,
     Uint8Array = _Uint8Array,
     eq = eq_1,
     equalArrays$1 = _equalArrays,
@@ -1896,7 +1896,7 @@ var arrayBufferTag = '[object ArrayBuffer]',
     dataViewTag = '[object DataView]';
 
 /** Used to convert symbols to primitives and strings. */
-var symbolProto$1 = Symbol$2 ? Symbol$2.prototype : undefined,
+var symbolProto$1 = Symbol$1 ? Symbol$1.prototype : undefined,
     symbolValueOf = symbolProto$1 ? symbolProto$1.valueOf : undefined;
 
 /**
@@ -2536,34 +2536,7 @@ var defaults = {
   keyboardEventsEnabled: false,
 };
 
-var controllerUtils$1 = {};
-
-var controllerUtils = {};
-
-var _typeof = {exports: {}};
-
-(function (module) {
-function _typeof(obj) {
-  "@babel/helpers - typeof";
-
-  return (module.exports = _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
-    return typeof obj;
-  } : function (obj) {
-    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  }, module.exports.__esModule = true, module.exports["default"] = module.exports), _typeof(obj);
-}
-
-module.exports = _typeof, module.exports.__esModule = true, module.exports["default"] = module.exports;
-}(_typeof));
-
-var partialScoring = {};
-
-Object.defineProperty(partialScoring, "__esModule", {
-  value: true
-});
-partialScoring.enabled = void 0;
-
-var enabled = function enabled(config, env, defaultValue) {
+const enabled = (config, env, defaultValue) => {
   // if model.partialScoring = false
   //  - if env.partialScoring = false || env.partialScoring = true => use dichotomous scoring
   // else if model.partialScoring = true || undefined
@@ -2583,22 +2556,6 @@ var enabled = function enabled(config, env, defaultValue) {
   return typeof defaultValue === 'boolean' ? defaultValue : true;
 };
 
-partialScoring.enabled = enabled;
-
-var persistence = {};
-
-var interopRequireDefault = {exports: {}};
-
-(function (module) {
-function _interopRequireDefault(obj) {
-  return obj && obj.__esModule ? obj : {
-    "default": obj
-  };
-}
-
-module.exports = _interopRequireDefault, module.exports.__esModule = true, module.exports["default"] = module.exports;
-}(interopRequireDefault));
-
 var baseGetTag = _baseGetTag,
     isObjectLike = isObjectLike_1;
 
@@ -2811,7 +2768,7 @@ function arrayMap$2(array, iteratee) {
 
 var _arrayMap = arrayMap$2;
 
-var Symbol$1 = _Symbol,
+var Symbol = _Symbol,
     arrayMap$1 = _arrayMap,
     isArray$2 = isArray_1,
     isSymbol$1 = isSymbol_1;
@@ -2820,7 +2777,7 @@ var Symbol$1 = _Symbol,
 var INFINITY$1 = 1 / 0;
 
 /** Used to convert symbols to primitives and strings. */
-var symbolProto = Symbol$1 ? Symbol$1.prototype : undefined,
+var symbolProto = Symbol ? Symbol.prototype : undefined,
     symbolToString = symbolProto ? symbolProto.toString : undefined;
 
 /**
@@ -3165,86 +3122,54 @@ function shuffle(collection) {
 
 var shuffle_1 = shuffle;
 
-var _interopRequireDefault = interopRequireDefault.exports;
-
-Object.defineProperty(persistence, "__esModule", {
-  value: true
-});
-persistence.lockChoices = persistence.getShuffledChoices = persistence.compact = void 0;
-
-var _typeof2 = _interopRequireDefault(_typeof.exports);
-
-var _get = _interopRequireDefault(get_1);
-
-var _shuffle = _interopRequireDefault(shuffle_1);
-
-var _isEmpty = _interopRequireDefault(isEmpty_1);
-
 // eslint-disable-next-line no-console
-var lg = function lg(n) {
-  return console[n].bind(console, 'controller-utils:');
-};
-
-var debug = lg('debug');
-var log = lg('log');
-var warn = lg('warn');
-var error = lg('error');
+const lg = (n) => console[n].bind(console, 'controller-utils:');
+const debug = lg('debug');
+const log = lg('log');
+const warn = lg('warn');
+const error = lg('error');
 
-var compact = function compact(arr) {
+const compact = (arr) => {
   if (Array.isArray(arr)) {
-    return arr.filter(function (v) {
-      return v !== null && v !== undefined;
-    });
+    return arr.filter((v) => v !== null && v !== undefined);
   }
-
   return arr;
 };
 
-persistence.compact = compact;
-
-var getShuffledChoices = function getShuffledChoices(choices, session, updateSession, choiceKey) {
-  return new Promise(function (resolve) {
-    var _session$data;
-
-    log('updateSession type: ', (0, _typeof2["default"])(updateSession));
+const getShuffledChoices = (choices, session, updateSession, choiceKey) =>
+  new Promise((resolve) => {
+    log('updateSession type: ', typeof updateSession);
     log('session: ', session);
-    var currentShuffled = compact((session === null || session === void 0 ? void 0 : (_session$data = session.data) === null || _session$data === void 0 ? void 0 : _session$data.shuffledValues) || (session === null || session === void 0 ? void 0 : session.shuffledValues) || []);
+
+    const currentShuffled = compact(session?.data?.shuffledValues || session?.shuffledValues || []);
 
     if (!session) {
       // eslint-disable-next-line quotes
       warn("unable to save shuffled choices because there's no session.");
       resolve(undefined);
-    } else if (!(0, _isEmpty["default"])(currentShuffled)) {
-      var _session$data2;
-
-      debug('use shuffledValues to sort the choices...', (_session$data2 = session.data) === null || _session$data2 === void 0 ? void 0 : _session$data2.shuffledValues);
-      resolve(compact(currentShuffled.map(function (v) {
-        return choices.find(function (c) {
-          return c[choiceKey] === v;
-        });
-      })));
+    } else if (!isEmpty_1(currentShuffled)) {
+      debug('use shuffledValues to sort the choices...', session.data?.shuffledValues);
+      resolve(compact(currentShuffled.map((v) => choices.find((c) => c[choiceKey] === v))));
     } else {
-      var shuffledChoices = (0, _shuffle["default"])(choices);
+      const shuffledChoices = shuffle_1(choices);
 
       if (updateSession && typeof updateSession === 'function') {
         try {
           //Note: session.id refers to the id of the element within a session
-          var shuffledValues = compact(shuffledChoices.map(function (c) {
-            return c[choiceKey];
-          }));
+          const shuffledValues = compact(shuffledChoices.map((c) => c[choiceKey]));
           log('try to save shuffledValues to session...', shuffledValues);
           log('call updateSession... ', session.id, session.element);
-
-          if ((0, _isEmpty["default"])(shuffledValues)) {
-            error("shuffledValues is an empty array? - refusing to call updateSession: shuffledChoices: ".concat(JSON.stringify(shuffledChoices), ", key: ").concat(choiceKey));
+          if (isEmpty_1(shuffledValues)) {
+            error(
+              `shuffledValues is an empty array? - refusing to call updateSession: shuffledChoices: ${JSON.stringify(
+                shuffledChoices,
+              )}, key: ${choiceKey}`,
+            );
           } else {
-            updateSession(session.id, session.element, {
-              shuffledValues: shuffledValues
-            })["catch"](function (e) {
-              return (// eslint-disable-next-line no-console
-                console.error('update session failed for: ', session.id, e)
-              );
-            });
+            updateSession(session.id, session.element, { shuffledValues }).catch((e) =>
+              // eslint-disable-next-line no-console
+              console.error('update session failed for: ', session.id, e),
+            );
           }
         } catch (e) {
           warn('unable to save shuffled order for choices');
@@ -3252,13 +3177,12 @@ var getShuffledChoices = function getShuffledChoices(choices, session, updateSes
         }
       } else {
         warn('unable to save shuffled choices, shuffle will happen every time.');
-      } //save this shuffle to the session for later retrieval
-
-
+      }
+      //save this shuffle to the session for later retrieval
       resolve(shuffledChoices);
     }
   });
-};
+
 /**
  * If we return:
  * - true - that means that the order of the choices will be ordinal (as is created in the configure item)
@@ -3269,101 +3193,35 @@ var getShuffledChoices = function getShuffledChoices(choices, session, updateSes
  * @param env - env to check if we should lock order
  * @returns {boolean}
  */
-
-
-persistence.getShuffledChoices = getShuffledChoices;
-
-var lockChoices = function lockChoices(model, session, env) {
+const lockChoices = (model, session, env) => {
   if (model.lockChoiceOrder) {
     return true;
   }
 
-  log('lockChoiceOrder: ', (0, _get["default"])(env, ['@pie-element', 'lockChoiceOrder'], false));
+  log('lockChoiceOrder: ', get_1(env, ['@pie-element', 'lockChoiceOrder'], false));
 
-  if ((0, _get["default"])(env, ['@pie-element', 'lockChoiceOrder'], false)) {
+  if (get_1(env, ['@pie-element', 'lockChoiceOrder'], false)) {
     return true;
   }
 
-  var role = (0, _get["default"])(env, 'role', 'student');
+  const role = get_1(env, 'role', 'student');
 
   if (role === 'instructor') {
     // TODO: .. in the future the instructor can toggle between ordinal and shuffled here, so keeping this code until then
-
     /*const alreadyShuffled = hasShuffledValues(session);
-     if (alreadyShuffled) {
+
+    if (alreadyShuffled) {
       return false;
     }
-     return true;*/
-    return true;
-  } // here it's a student, so don't lock and it will shuffle if needs be
 
+    return true;*/
+    return true;
+  }
 
+  // here it's a student, so don't lock and it will shuffle if needs be
   return false;
 };
 
-persistence.lockChoices = lockChoices;
-
-(function (exports) {
-
-var _typeof$1 = _typeof.exports;
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "getShuffledChoices", {
-  enumerable: true,
-  get: function get() {
-    return _persistence.getShuffledChoices;
-  }
-});
-Object.defineProperty(exports, "lockChoices", {
-  enumerable: true,
-  get: function get() {
-    return _persistence.lockChoices;
-  }
-});
-exports.partialScoring = void 0;
-
-var partialScoring$1 = _interopRequireWildcard(partialScoring);
-
-exports.partialScoring = partialScoring$1;
-
-var _persistence = persistence;
-
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof$1(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
-}(controllerUtils));
-
-(function (exports) {
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "getShuffledChoices", {
-  enumerable: true,
-  get: function get() {
-    return _controllerUtils.getShuffledChoices;
-  }
-});
-Object.defineProperty(exports, "lockChoices", {
-  enumerable: true,
-  get: function get() {
-    return _controllerUtils.lockChoices;
-  }
-});
-Object.defineProperty(exports, "partialScoring", {
-  enumerable: true,
-  get: function get() {
-    return _controllerUtils.partialScoring;
-  }
-});
-
-var _controllerUtils = controllerUtils;
-
-}(controllerUtils$1));
-
 /* eslint-disable no-console */
 
 const prepareChoice = (model, env, defaultFeedback) => (choice) => {
@@ -3429,10 +3287,10 @@ async function model(question, session, env, updateSession) {
 
   let choices = (normalizedQuestion.choices || []).map(prepareChoice(normalizedQuestion, env, defaultFeedback));
 
-  const lockChoiceOrder = controllerUtils$1.lockChoices(normalizedQuestion, session, env);
+  const lockChoiceOrder = lockChoices(normalizedQuestion, session, env);
 
   if (!lockChoiceOrder) {
-    choices = await controllerUtils$1.getShuffledChoices(choices, session, updateSession, 'value');
+    choices = await getShuffledChoices(choices, session, updateSession, 'value');
   }
 
   const out = {
@@ -3511,7 +3369,7 @@ function outcome(model, session, env) {
     if (!session || isEmpty_1(session)) {
       resolve({ score: 0, empty: true });
     } else {
-      const partialScoringEnabled = controllerUtils$1.partialScoring.enabled(model, env) && model.choiceMode !== 'radio';
+      const partialScoringEnabled = enabled(model, env) && model.choiceMode !== 'radio';
       const score = getScore(model, session);
 
       resolve({ score: partialScoringEnabled ? score : score === 1 ? 1 : 0, empty: false });