@pie-lib/controller-utils 0.2.44 → 0.3.0-beta.2

package/CHANGELOG.md

@@ -3,7 +3,7 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.2.44](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.43...@pie-lib/controller-utils@0.2.44) (2023-06-24)
+# [0.3.0-beta.2](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.44...@pie-lib/controller-utils@0.3.0-beta.2) (2025-07-20)
 
 **Note:** Version bump only for package @pie-lib/controller-utils
 
@@ -11,18 +11,15 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.43](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.42...@pie-lib/controller-utils@0.2.43) (2023-04-19)
-
-
-### Bug Fixes
+# [0.3.0-beta.1](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.44...@pie-lib/controller-utils@0.3.0-beta.1) (2025-07-20)
 
-* **eslint:** fix eslint problems-PD-2732 ([9eb9976](https://github.com/pie-framework/pie-lib/commit/9eb9976749753da86e1057a07bd2cfc65bf64ae4))
+**Note:** Version bump only for package @pie-lib/controller-utils
 
 
 
 
 
-## [0.2.42](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.40...@pie-lib/controller-utils@0.2.42) (2023-01-31)
+# [0.3.0-beta.1](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.44...@pie-lib/controller-utils@0.3.0-beta.1) (2025-07-20)
 
 **Note:** Version bump only for package @pie-lib/controller-utils
 
@@ -30,7 +27,7 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.40](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.39...@pie-lib/controller-utils@0.2.40) (2023-01-31)
+# [0.3.0-beta.0](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.44...@pie-lib/controller-utils@0.3.0-beta.0) (2025-07-20)
 
 **Note:** Version bump only for package @pie-lib/controller-utils
 
@@ -38,54 +35,56 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 
 
-## [0.2.39](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.38...@pie-lib/controller-utils@0.2.39) (2023-01-31)
+# [0.4.0-beta.0](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.44...@pie-lib/controller-utils@0.4.0-beta.0) (2025-07-15)
 
 **Note:** Version bump only for package @pie-lib/controller-utils
 
+# [0.3.0-beta.0](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.44...@pie-lib/controller-utils@0.3.0-beta.0) (2025-07-15)
 
+**Note:** Version bump only for package @pie-lib/controller-utils
 
-
-
-## [0.2.38](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.37...@pie-lib/controller-utils@0.2.38) (2023-01-31)
+## [0.2.44](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.43...@pie-lib/controller-utils@0.2.44) (2023-06-24)
 
 **Note:** Version bump only for package @pie-lib/controller-utils
 
+## [0.2.43](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.42...@pie-lib/controller-utils@0.2.43) (2023-04-19)
 
+### Bug Fixes
 
+- **eslint:** fix eslint problems-PD-2732 ([9eb9976](https://github.com/pie-framework/pie-lib/commit/9eb9976749753da86e1057a07bd2cfc65bf64ae4))
 
-
-## [0.2.37](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.31...@pie-lib/controller-utils@0.2.37) (2023-01-31)
+## [0.2.42](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.40...@pie-lib/controller-utils@0.2.42) (2023-01-31)
 
 **Note:** Version bump only for package @pie-lib/controller-utils
 
+## [0.2.40](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.39...@pie-lib/controller-utils@0.2.40) (2023-01-31)
 
+**Note:** Version bump only for package @pie-lib/controller-utils
 
+## [0.2.39](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.38...@pie-lib/controller-utils@0.2.39) (2023-01-31)
 
+**Note:** Version bump only for package @pie-lib/controller-utils
 
-## [0.2.31](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.29...@pie-lib/controller-utils@0.2.31) (2023-01-31)
+## [0.2.38](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.37...@pie-lib/controller-utils@0.2.38) (2023-01-31)
 
 **Note:** Version bump only for package @pie-lib/controller-utils
 
+## [0.2.37](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.31...@pie-lib/controller-utils@0.2.37) (2023-01-31)
 
+**Note:** Version bump only for package @pie-lib/controller-utils
 
+## [0.2.31](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.29...@pie-lib/controller-utils@0.2.31) (2023-01-31)
 
+**Note:** Version bump only for package @pie-lib/controller-utils
 
 ## [0.2.29](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.27...@pie-lib/controller-utils@0.2.29) (2023-01-31)
 
 **Note:** Version bump only for package @pie-lib/controller-utils
 
-
-
-
-
 ## [0.2.27](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.26...@pie-lib/controller-utils@0.2.27) (2022-11-23)
 
 **Note:** Version bump only for package @pie-lib/controller-utils
 
-
-
-
-
 ## [0.2.26](https://github.com/pie-framework/pie-lib/compare/@pie-lib/controller-utils@0.2.24...@pie-lib/controller-utils@0.2.26) (2021-06-25)
 
 **Note:** Version bump only for package @pie-lib/controller-utils

package/NEXT.CHANGELOG.json

@@ -0,0 +1 @@
+[]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pie-lib/controller-utils",
-  "version": "0.2.44",
+  "version": "0.3.0-beta.2",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",
@@ -14,5 +14,5 @@
   "scripts": {},
   "author": "",
   "license": "ISC",
-  "gitHead": "4043c98430c000ce3a25357d92845175b076ea21"
+  "gitHead": "e2aa3ddac60f49bcb8c2562370f496323642f453"
 }

package/src/__tests__/partial-scoring.test.js

@@ -0,0 +1,25 @@
+import { enabled } from '../partial-scoring';
+
+describe('enabled', () => {
+  const assertEnabled = (config, env, expected) => {
+    it(`returns ${expected} for: config: ${config.partialScoring}, env:${env.partialScoring}`, () => {
+      const result = enabled(config, env);
+      expect(result).toEqual(expected);
+    });
+  };
+
+  const config = (v) => ({ partialScoring: v });
+  const env = (v) => ({ partialScoring: v });
+
+  assertEnabled(config(undefined), env(undefined), true);
+  assertEnabled(config(undefined), env(true), true);
+  assertEnabled(config(undefined), env(false), false);
+
+  assertEnabled(config(false), env(undefined), false);
+  assertEnabled(config(false), env(true), false);
+  assertEnabled(config(false), env(false), false);
+
+  assertEnabled(config(true), env(undefined), true);
+  assertEnabled(config(true), env(true), true);
+  assertEnabled(config(true), env(false), false);
+});

package/src/__tests__/persistence.test.js

@@ -0,0 +1,151 @@
+import { getShuffledChoices, lockChoices } from '../persistence';
+
+describe('getShuffledChoices', () => {
+  let choices, session, updateSession, key;
+
+  beforeEach(() => {
+    updateSession = jest.fn().mockResolvedValue([]);
+    session = {
+      id: '1',
+      element: 'element',
+    };
+    choices = [
+      {
+        value: 1,
+      },
+      {
+        value: 2,
+      },
+    ];
+    key = 'value';
+  });
+
+  describe('0 key', () => {
+    it('calls update session w/ 0 as a key', async () => {
+      const result = await getShuffledChoices([{ value: 0 }, { value: 1 }], session, updateSession, 'value');
+      expect(updateSession).toHaveBeenCalledWith(session.id, session.element, {
+        shuffledValues: expect.arrayContaining([0, 1]),
+      });
+    });
+  });
+
+  describe('handles null values in session', () => {
+    beforeEach(async () => {
+      const result = await getShuffledChoices(choices, { ...session, shuffledValues: [null] }, updateSession, 'value');
+    });
+
+    it('calls updateSession w/ new shuffle cos [null] is treated as empty', () => {
+      expect(updateSession).toHaveBeenCalledWith(session.id, session.element, {
+        shuffledValues: expect.arrayContaining([1, 2]),
+      });
+    });
+  });
+  describe('bad shuffle generation does not call updateSession', () => {
+    beforeEach(async () => {
+      const result = await getShuffledChoices(choices, {}, updateSession, 'foo');
+    });
+    it('does not call update session', () => {
+      expect(updateSession).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('session does not exist', () => {
+    it('returns undefined for empty session', async () => {
+      const result = await getShuffledChoices(choices, undefined, updateSession, key);
+      expect(result).toEqual(undefined);
+    });
+  });
+
+  describe('session exists', () => {
+    it('returns compact choices if session has shuffledValues', async () => {
+      session = { shuffledValues: [2, 1] };
+      const result = await getShuffledChoices(choices, session, updateSession, key);
+      expect(result).toEqual(expect.arrayContaining(choices));
+    });
+
+    it('returns shuffled choices if updateSession is a function', async () => {
+      session = {};
+      updateSession = jest.fn().mockResolvedValue();
+      const result = await getShuffledChoices(choices, session, updateSession, key);
+      expect(result).toEqual(expect.arrayContaining(choices));
+    });
+
+    it('calls updateSession as expected if updateSession is a function', async () => {
+      session = { id: '1', element: 'pie-element' };
+      await getShuffledChoices(choices, session, updateSession, key);
+      expect(updateSession).toHaveBeenCalledWith('1', 'pie-element', {
+        shuffledValues: expect.arrayContaining([1, 2]),
+      });
+    });
+  });
+});
+
+describe('lockChoices', () => {
+  const env = (lockChoiceOrder, role = 'student') => ({
+    '@pie-element': { lockChoiceOrder },
+    role,
+  });
+  const session = (shuffledValues) => ({ shuffledValues });
+  it.each`
+    modelLock    | session            | env                         | expected
+    ${true}      | ${session()}       | ${env(true)}                | ${true}
+    ${true}      | ${session()}       | ${env(false)}               | ${true}
+    ${false}     | ${session()}       | ${env(true)}                | ${true}
+    ${false}     | ${session()}       | ${env(false)}               | ${false}
+    ${false}     | ${session()}       | ${undefined}                | ${false}
+    ${false}     | ${undefined}       | ${undefined}                | ${false}
+    ${undefined} | ${session()}       | ${env(false)}               | ${false}
+    ${undefined} | ${session()}       | ${env(undefined)}           | ${false}
+    ${false}     | ${session()}       | ${env(false, 'instructor')} | ${true}
+    ${false}     | ${session([0, 1])} | ${env(false, 'instructor')} | ${true}
+    ${false}     | ${undefined}       | ${env(false, 'instructor')} | ${true}
+  `('1. model.lockChoiceOrder: $modelLock, $session, $env => $expected', ({ modelLock, session, env, expected }) => {
+    const model = { lockChoiceOrder: modelLock };
+    const result = lockChoices(model, session, env);
+    expect(result).toEqual(expected);
+  });
+});
+
+describe('lockChoices mod', () => {
+  const env = (lockChoiceOrder, role = 'student') => ({
+    '@pie-element': { lockChoiceOrder },
+    role,
+  });
+  const session = (answers = ['foo', 'bar']) => ({ answers });
+  it.each`
+    modelLock    | session      | env                             | expected
+    ${true}      | ${session()} | ${env(true)}                    | ${true}
+    ${true}      | ${session()} | ${env(false)}                   | ${true}
+    ${false}     | ${session()} | ${env(true)}                    | ${true}
+    ${false}     | ${session()} | ${env(false)}                   | ${false}
+    ${undefined} | ${session()} | ${env(true)}                    | ${true}
+    ${undefined} | ${session()} | ${env(undefined)}               | ${false}
+    ${undefined} | ${session()} | ${env(undefined, 'instructor')} | ${true}
+  `('2. model.lockChoiceOrder: $modelLock, $session, $env => $expected', ({ modelLock, session, env, expected }) => {
+    const model = { lockChoiceOrder: modelLock };
+    const result = lockChoices(model, session, env);
+    expect(result).toEqual(expected);
+  });
+});
+
+describe('lockChoices', () => {
+  const env = (lockChoiceOrder, role = 'student') => ({
+    '@pie-element': { lockChoiceOrder },
+    role,
+  });
+  const session = (shuffledValues) => ({ shuffledValues, answers: ['foo', 'bar'] });
+  it.each`
+    modelLock    | session      | env                             | expected
+    ${true}      | ${session()} | ${env(true)}                    | ${true}
+    ${true}      | ${session()} | ${env(false)}                   | ${true}
+    ${false}     | ${session()} | ${env(true)}                    | ${true}
+    ${false}     | ${session()} | ${env(false)}                   | ${false}
+    ${undefined} | ${session()} | ${env(true)}                    | ${true}
+    ${undefined} | ${session()} | ${env(undefined)}               | ${false}
+    ${undefined} | ${session()} | ${env(undefined, 'instructor')} | ${true}
+  `('3. model.lockChoiceOrder: $modelLock, $env => $expected', ({ modelLock, session, env, expected }) => {
+    const model = { lockChoiceOrder: modelLock };
+    const result = lockChoices(model, session, env);
+    expect(result).toEqual(expected);
+  });
+});

package/src/index.js

@@ -1,3 +1,4 @@
 import * as partialScoring from './partial-scoring';
+
 export { lockChoices, getShuffledChoices } from './persistence';
 export { partialScoring };

package/src/partial-scoring.js

@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 export const enabled = (config, env, defaultValue) => {
   // if model.partialScoring = false
   //  - if env.partialScoring = false || env.partialScoring = true => use dichotomous scoring
@@ -17,5 +15,5 @@ export const enabled = (config, env, defaultValue) => {
     return false;
   }
 
-  return _.isBoolean(defaultValue) ? defaultValue : true;
+  return typeof defaultValue === 'boolean' ? defaultValue : true;
 };

package/src/persistence.js

@@ -1,8 +1,6 @@
 import get from 'lodash/get';
 import shuffle from 'lodash/shuffle';
 import isEmpty from 'lodash/isEmpty';
-import isNull from 'lodash/isNull';
-import isUndefined from 'lodash/isUndefined';
 
 // eslint-disable-next-line no-console
 const lg = (n) => console[n].bind(console, 'controller-utils:');
@@ -13,7 +11,7 @@ const error = lg('error');
 
 export const compact = (arr) => {
   if (Array.isArray(arr)) {
-    return arr.filter((v) => !isNull(v) && !isUndefined(v));
+    return arr.filter((v) => v !== null && v !== undefined);
   }
   return arr;
 };
@@ -23,14 +21,14 @@ export const getShuffledChoices = (choices, session, updateSession, choiceKey) =
     log('updateSession type: ', typeof updateSession);
     log('session: ', session);
 
-    const currentShuffled = compact((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 (!isEmpty(currentShuffled)) {
-      debug('use shuffledValues to sort the choices...', session.shuffledValues);
+      debug('use shuffledValues to sort the choices...', session.data?.shuffledValues);
       resolve(compact(currentShuffled.map((v) => choices.find((c) => c[choiceKey] === v))));
     } else {
       const shuffledChoices = shuffle(choices);

package/README.md

@@ -1,5 +0,0 @@
-# controller utils
-
-Some utilities for pie controllers.
-
-> This package must be able to run server and client side. _Don't add any client specific libraries to this package_.

package/lib/index.js

@@ -1,31 +0,0 @@
-"use strict";
-
-var _typeof = require("@babel/runtime/helpers/typeof");
-
-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 = _interopRequireWildcard(require("./partial-scoring"));
-
-exports.partialScoring = partialScoring;
-
-var _persistence = require("./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(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; }
-//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;AACA","sourcesContent":["import * as partialScoring from './partial-scoring';\nexport { lockChoices, getShuffledChoices } from './persistence';\nexport { partialScoring };\n"],"file":"index.js"}

package/lib/partial-scoring.js

@@ -1,33 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.enabled = void 0;
-
-var _lodash = _interopRequireDefault(require("lodash"));
-
-var enabled = function enabled(config, env, defaultValue) {
-  // if model.partialScoring = false
-  //  - if env.partialScoring = false || env.partialScoring = true => use dichotomous scoring
-  // else if model.partialScoring = true || undefined
-  //  - if env.partialScoring = false, use dichotomous scoring
-  //  - else if env.partialScoring = true, use partial scoring
-  config = config || {};
-  env = env || {};
-
-  if (config.partialScoring === false) {
-    return false;
-  }
-
-  if (env.partialScoring === false) {
-    return false;
-  }
-
-  return _lodash["default"].isBoolean(defaultValue) ? defaultValue : true;
-};
-
-exports.enabled = enabled;
-//# sourceMappingURL=partial-scoring.js.map

package/lib/partial-scoring.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/partial-scoring.js"],"names":["enabled","config","env","defaultValue","partialScoring","_","isBoolean"],"mappings":";;;;;;;;;AAAA;;AAEO,IAAMA,OAAO,GAAG,SAAVA,OAAU,CAACC,MAAD,EAASC,GAAT,EAAcC,YAAd,EAA+B;AACpD;AACA;AACA;AACA;AACA;AACAF,EAAAA,MAAM,GAAGA,MAAM,IAAI,EAAnB;AACAC,EAAAA,GAAG,GAAGA,GAAG,IAAI,EAAb;;AAEA,MAAID,MAAM,CAACG,cAAP,KAA0B,KAA9B,EAAqC;AACnC,WAAO,KAAP;AACD;;AAED,MAAIF,GAAG,CAACE,cAAJ,KAAuB,KAA3B,EAAkC;AAChC,WAAO,KAAP;AACD;;AAED,SAAOC,mBAAEC,SAAF,CAAYH,YAAZ,IAA4BA,YAA5B,GAA2C,IAAlD;AACD,CAlBM","sourcesContent":["import _ from 'lodash';\n\nexport const enabled = (config, env, defaultValue) => {\n  // if model.partialScoring = false\n  //  - if env.partialScoring = false || env.partialScoring = true => use dichotomous scoring\n  // else if model.partialScoring = true || undefined\n  //  - if env.partialScoring = false, use dichotomous scoring\n  //  - else if env.partialScoring = true, use partial scoring\n  config = config || {};\n  env = env || {};\n\n  if (config.partialScoring === false) {\n    return false;\n  }\n\n  if (env.partialScoring === false) {\n    return false;\n  }\n\n  return _.isBoolean(defaultValue) ? defaultValue : true;\n};\n"],"file":"partial-scoring.js"}

package/lib/persistence.js

@@ -1,140 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.lockChoices = exports.getShuffledChoices = exports.compact = void 0;
-
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-var _get = _interopRequireDefault(require("lodash/get"));
-
-var _shuffle = _interopRequireDefault(require("lodash/shuffle"));
-
-var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
-
-var _isNull = _interopRequireDefault(require("lodash/isNull"));
-
-var _isUndefined = _interopRequireDefault(require("lodash/isUndefined"));
-
-// 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');
-
-var compact = function compact(arr) {
-  if (Array.isArray(arr)) {
-    return arr.filter(function (v) {
-      return !(0, _isNull["default"])(v) && !(0, _isUndefined["default"])(v);
-    });
-  }
-
-  return arr;
-};
-
-exports.compact = compact;
-
-var getShuffledChoices = function getShuffledChoices(choices, session, updateSession, choiceKey) {
-  return new Promise(function (resolve) {
-    log('updateSession type: ', (0, _typeof2["default"])(updateSession));
-    log('session: ', session);
-    var currentShuffled = compact((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)) {
-      debug('use shuffledValues to sort the choices...', session.shuffledValues);
-      resolve(compact(currentShuffled.map(function (v) {
-        return choices.find(function (c) {
-          return c[choiceKey] === v;
-        });
-      })));
-    } else {
-      var shuffledChoices = (0, _shuffle["default"])(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];
-          }));
-          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));
-          } 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)
-              );
-            });
-          }
-        } catch (e) {
-          warn('unable to save shuffled order for choices');
-          error(e);
-        }
-      } else {
-        warn('unable to save shuffled choices, shuffle will happen every time.');
-      } //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)
- * - false - that means the getShuffledChoices above will be called and that in turn means that we either
- * return the shuffled values on the session (if any exists) or we shuffle the choices
- * @param model - model to check if we should lock order
- * @param session - session to check if we should lock order
- * @param env - env to check if we should lock order
- * @returns {boolean}
- */
-
-
-exports.getShuffledChoices = getShuffledChoices;
-
-var lockChoices = function lockChoices(model, session, env) {
-  if (model.lockChoiceOrder) {
-    return true;
-  }
-
-  log('lockChoiceOrder: ', (0, _get["default"])(env, ['@pie-element', 'lockChoiceOrder'], false));
-
-  if ((0, _get["default"])(env, ['@pie-element', 'lockChoiceOrder'], false)) {
-    return true;
-  }
-
-  var role = (0, _get["default"])(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) {
-      return false;
-    }
-     return true;*/
-    return true;
-  } // here it's a student, so don't lock and it will shuffle if needs be
-
-
-  return false;
-};
-
-exports.lockChoices = lockChoices;
-//# sourceMappingURL=persistence.js.map

package/lib/persistence.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../src/persistence.js"],"names":["lg","n","console","bind","debug","log","warn","error","compact","arr","Array","isArray","filter","v","getShuffledChoices","choices","session","updateSession","choiceKey","Promise","resolve","currentShuffled","shuffledValues","undefined","map","find","c","shuffledChoices","id","element","JSON","stringify","e","lockChoices","model","env","lockChoiceOrder","role"],"mappings":"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","sourcesContent":["import get from 'lodash/get';\nimport shuffle from 'lodash/shuffle';\nimport isEmpty from 'lodash/isEmpty';\nimport isNull from 'lodash/isNull';\nimport isUndefined from 'lodash/isUndefined';\n\n// eslint-disable-next-line no-console\nconst lg = (n) => console[n].bind(console, 'controller-utils:');\nconst debug = lg('debug');\nconst log = lg('log');\nconst warn = lg('warn');\nconst error = lg('error');\n\nexport const compact = (arr) => {\n  if (Array.isArray(arr)) {\n    return arr.filter((v) => !isNull(v) && !isUndefined(v));\n  }\n  return arr;\n};\n\nexport const getShuffledChoices = (choices, session, updateSession, choiceKey) =>\n  new Promise((resolve) => {\n    log('updateSession type: ', typeof updateSession);\n    log('session: ', session);\n\n    const currentShuffled = compact((session || {}).shuffledValues);\n\n    if (!session) {\n      // eslint-disable-next-line quotes\n      warn(\"unable to save shuffled choices because there's no session.\");\n      resolve(undefined);\n    } else if (!isEmpty(currentShuffled)) {\n      debug('use shuffledValues to sort the choices...', session.shuffledValues);\n      resolve(compact(currentShuffled.map((v) => choices.find((c) => c[choiceKey] === v))));\n    } else {\n      const shuffledChoices = shuffle(choices);\n\n      if (updateSession && typeof updateSession === 'function') {\n        try {\n          //Note: session.id refers to the id of the element within a session\n          const shuffledValues = compact(shuffledChoices.map((c) => c[choiceKey]));\n          log('try to save shuffledValues to session...', shuffledValues);\n          log('call updateSession... ', session.id, session.element);\n          if (isEmpty(shuffledValues)) {\n            error(\n              `shuffledValues is an empty array? - refusing to call updateSession: shuffledChoices: ${JSON.stringify(\n                shuffledChoices,\n              )}, key: ${choiceKey}`,\n            );\n          } else {\n            updateSession(session.id, session.element, { shuffledValues }).catch((e) =>\n              // eslint-disable-next-line no-console\n              console.error('update session failed for: ', session.id, e),\n            );\n          }\n        } catch (e) {\n          warn('unable to save shuffled order for choices');\n          error(e);\n        }\n      } else {\n        warn('unable to save shuffled choices, shuffle will happen every time.');\n      }\n      //save this shuffle to the session for later retrieval\n      resolve(shuffledChoices);\n    }\n  });\n\n/**\n * If we return:\n * - true - that means that the order of the choices will be ordinal (as is created in the configure item)\n * - false - that means the getShuffledChoices above will be called and that in turn means that we either\n * return the shuffled values on the session (if any exists) or we shuffle the choices\n * @param model - model to check if we should lock order\n * @param session - session to check if we should lock order\n * @param env - env to check if we should lock order\n * @returns {boolean}\n */\nexport const lockChoices = (model, session, env) => {\n  if (model.lockChoiceOrder) {\n    return true;\n  }\n\n  log('lockChoiceOrder: ', get(env, ['@pie-element', 'lockChoiceOrder'], false));\n\n  if (get(env, ['@pie-element', 'lockChoiceOrder'], false)) {\n    return true;\n  }\n\n  const role = get(env, 'role', 'student');\n\n  if (role === 'instructor') {\n    // TODO: .. in the future the instructor can toggle between ordinal and shuffled here, so keeping this code until then\n    /*const alreadyShuffled = hasShuffledValues(session);\n\n    if (alreadyShuffled) {\n      return false;\n    }\n\n    return true;*/\n    return true;\n  }\n\n  // here it's a student, so don't lock and it will shuffle if needs be\n  return false;\n};\n"],"file":"persistence.js"}