@pie-element/placement-ordering 12.3.4-next.3 → 13.0.0-beta.1

package/configure/lib/utils.js

@@ -1,14 +1,109 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.buildTiles = buildTiles;
 exports.generateValidationMessage = void 0;
-
-var generateValidationMessage = function generateValidationMessage() {
-  var answersMessage = '\nThere should be at least 3 tokens.' + '\nThe tokens should not be empty and should be unique.' + '\nThe correct ordering should not be identical to the initial ordering.';
+exports.normalizeIndex = normalizeIndex;
+exports.updateResponseOrChoices = updateResponseOrChoices;
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
+const generateValidationMessage = () => {
+  const answersMessage = '\nThere should be at least 3 tokens.' + '\nThe tokens should not be empty and should be unique.' + '\nThe correct ordering should not be identical to the initial ordering.';
   return 'Validation requirements:' + answersMessage;
 };
-
 exports.generateValidationMessage = generateValidationMessage;
+function normalizeIndex(tile, ordering) {
+  if (tile.type === 'target') {
+    return ordering.response.findIndex(r => r.id === tile.id);
+  }
+  if (tile.type === 'choice') {
+    return ordering.choices.findIndex(c => c.id === tile.id);
+  }
+  return -1;
+}
+function updateResponseOrChoices(response, choices, from, to) {
+  const {
+    type: fromType,
+    index: fromIndex
+  } = from;
+  const {
+    type: toType,
+    index: placeAtIndex
+  } = to;
+  if (fromType === 'target' && toType === 'target') {
+    const updatedResponse = (0, _cloneDeep.default)(response) || [];
+    const {
+      movedItem,
+      remainingItems
+    } = updatedResponse.reduce((acc, item, index) => {
+      if (index === fromIndex) {
+        acc.movedItem = item;
+      } else {
+        acc.remainingItems.push(item);
+      }
+      return acc;
+    }, {
+      movedItem: null,
+      remainingItems: []
+    });
+    return {
+      response: [...remainingItems.slice(0, placeAtIndex), movedItem, ...remainingItems.slice(placeAtIndex)],
+      choices
+    };
+  }
+  if (fromType === 'choice' && toType === 'choice') {
+    const updatedChoices = (0, _cloneDeep.default)(choices) || [];
+    const {
+      movedItem,
+      remainingItems,
+      toIndex
+    } = updatedChoices.reduce((acc, item, index) => {
+      if (item.id === from.id) {
+        acc.movedItem = item;
+      } else {
+        acc.remainingItems.push(item);
+      }
+      if (item.id === to.id) {
+        acc.toIndex = index;
+      }
+      return acc;
+    }, {
+      movedItem: null,
+      remainingItems: [],
+      toIndex: null
+    });
+    return {
+      response,
+      choices: [...remainingItems.slice(0, toIndex), movedItem, ...remainingItems.slice(toIndex)]
+    };
+  }
+  return {
+    response,
+    choices
+  };
+}
+function buildTiles(choices, response) {
+  const targets = response.map((r, index) => {
+    const respId = r && r.id;
+    const choice = choices.find(c => respId !== undefined && respId !== null && c.id === respId);
+    return {
+      type: 'target',
+      ...choice,
+      draggable: true,
+      index,
+      editable: false
+    };
+  });
+  const processedChoices = choices.map(m => {
+    return Object.assign({}, m, {
+      type: 'choice',
+      droppable: false,
+      draggable: true,
+      editable: true
+    });
+  });
+  return processedChoices.concat(targets);
+}
 //# sourceMappingURL=utils.js.map

package/configure/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/utils.js"],"names":["generateValidationMessage","answersMessage"],"mappings":";;;;;;;AAAO,IAAMA,yBAAyB,GAAG,SAA5BA,yBAA4B,GAAM;AAC7C,MAAMC,cAAc,GAClB,yCACA,wDADA,GAEA,yEAHF;AAKA,SAAO,6BAA6BA,cAApC;AACD,CAPM","sourcesContent":["export const generateValidationMessage = () => {\n  const answersMessage =\n    '\\nThere should be at least 3 tokens.' +\n    '\\nThe tokens should not be empty and should be unique.' +\n    '\\nThe correct ordering should not be identical to the initial ordering.';\n\n  return 'Validation requirements:' + answersMessage;\n};\n"],"file":"utils.js"}
+{"version":3,"file":"utils.js","names":["_cloneDeep","_interopRequireDefault","require","generateValidationMessage","answersMessage","exports","normalizeIndex","tile","ordering","type","response","findIndex","r","id","choices","c","updateResponseOrChoices","from","to","fromType","index","fromIndex","toType","placeAtIndex","updatedResponse","cloneDeep","movedItem","remainingItems","reduce","acc","item","push","slice","updatedChoices","toIndex","buildTiles","targets","map","respId","choice","find","undefined","draggable","editable","processedChoices","m","Object","assign","droppable","concat"],"sources":["../src/utils.js"],"sourcesContent":["import cloneDeep from 'lodash/cloneDeep';\n\nexport const generateValidationMessage = () => {\n  const answersMessage =\n    '\\nThere should be at least 3 tokens.' +\n    '\\nThe tokens should not be empty and should be unique.' +\n    '\\nThe correct ordering should not be identical to the initial ordering.';\n\n  return 'Validation requirements:' + answersMessage;\n};\n\nexport function normalizeIndex(tile, ordering) {\n  if (tile.type === 'target') {\n    return ordering.response.findIndex(r => r.id === tile.id);\n  }\n\n  if (tile.type === 'choice') {\n    return ordering.choices.findIndex(c => c.id === tile.id);\n  }\n\n  return -1;\n}\n\nexport function updateResponseOrChoices(response, choices, from, to) {\n  const { type: fromType, index: fromIndex } = from;\n  const { type: toType, index: placeAtIndex } = to;\n\n  if (fromType === 'target' && toType === 'target') {\n    const updatedResponse = cloneDeep(response) || [];\n\n    const { movedItem, remainingItems } = updatedResponse.reduce(\n      (acc, item, index) => {\n        if (index === fromIndex) {\n          acc.movedItem = item;\n        } else {\n          acc.remainingItems.push(item);\n        }\n\n        return acc;\n      },\n      { movedItem: null, remainingItems: [] },\n    );\n\n    return {\n      response: [...remainingItems.slice(0, placeAtIndex), movedItem, ...remainingItems.slice(placeAtIndex)],\n      choices,\n    };\n  }\n\n  if (fromType === 'choice' && toType === 'choice') {\n    const updatedChoices = cloneDeep(choices) || [];\n\n    const { movedItem, remainingItems, toIndex } = updatedChoices.reduce(\n      (acc, item, index) => {\n        if (item.id === from.id) {\n          acc.movedItem = item;\n        } else {\n          acc.remainingItems.push(item);\n        }\n\n        if (item.id === to.id) {\n          acc.toIndex = index;\n        }\n\n        return acc;\n      },\n      { movedItem: null, remainingItems: [], toIndex: null },\n    );\n\n    return {\n      response,\n      choices: [...remainingItems.slice(0, toIndex), movedItem, ...remainingItems.slice(toIndex)],\n    };\n  }\n\n  return { response, choices };\n}\n\nexport function buildTiles(choices, response) {\n  const targets = response.map((r, index) => {\n    const respId = r && r.id;\n    const choice = choices.find((c) => respId !== undefined && respId !== null && c.id === respId);\n\n    return {\n      type: 'target',\n      ...choice,\n      draggable: true,\n      index,\n      editable: false,\n    };\n  });\n\n  const processedChoices = choices.map((m) => {\n    return Object.assign({}, m, {\n      type: 'choice',\n      droppable: false,\n      draggable: true,\n      editable: true,\n    });\n  });\n\n  return processedChoices.concat(targets);\n}"],"mappings":"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","ignoreList":[]}

package/configure/package.json

@@ -1,24 +1,26 @@
 {
   "name": "@pie-element/placement-ordering-configure",
-  "version": "9.3.3",
+  "version": "10.0.0-beta.1",
   "private": true,
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@material-ui/core": "^3.9.2",
-    "@material-ui/icons": "^3.0.1",
+    "@dnd-kit/core": "^6.3.1",
+    "@emotion/react": "^11.14.0",
+    "@emotion/style": "^0.8.0",
+    "@mui/icons-material": "^7.3.4",
+    "@mui/material": "^7.3.4",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/config-ui": "11.30.2",
-    "@pie-lib/drag": "2.22.2",
-    "@pie-lib/editable-html": "11.21.2",
-    "@pie-lib/render-ui": "4.35.2",
+    "@pie-lib/config-ui": "12.1.0-next.5",
+    "@pie-lib/drag": "3.1.0-next.5",
+    "@pie-lib/editable-html-tip-tap": "1.1.0-next.5",
+    "@pie-lib/render-ui": "5.1.0-next.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "nested-property": "^0.0.7",
     "pluralize": "^8.0.0",
     "prop-types": "^15.6.2",
-    "react": "^16.8.1",
-    "react-dnd": "^14.0.5",
-    "react-dom": "^16.8.1"
+    "react": "18.2.0",
+    "react-dom": "18.2.0"
   }
 }

package/controller/CHANGELOG.md

@@ -3,17 +3,6 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [9.3.3](https://github.com/pie-framework/pie-elements/compare/@pie-element/placement-ordering-controller@9.3.2...@pie-element/placement-ordering-controller@9.3.3) (2025-11-27)
-
-
-### Bug Fixes
-
-* bump libs PD-5274, PD-5211, PD-5248 ([7610b25](https://github.com/pie-framework/pie-elements/commit/7610b25423956b6492f33322513b3430051fca77))
-
-
-
-
-
 ## [9.3.2](https://github.com/pie-framework/pie-elements/compare/@pie-element/placement-ordering-controller@9.3.1...@pie-element/placement-ordering-controller@9.3.2) (2025-10-22)
 
 

package/controller/lib/defaults.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = void 0;
-var _default = {
+exports.default = void 0;
+var _default = exports.default = {
   choiceLabel: '',
   choiceLabelEnabled: true,
   choices: [],
@@ -26,5 +26,4 @@ var _default = {
   teacherInstructionsEnabled: true,
   toolbarEditorPosition: 'bottom'
 };
-exports["default"] = _default;
 //# sourceMappingURL=defaults.js.map

package/controller/lib/defaults.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/defaults.js"],"names":["choiceLabel","choiceLabelEnabled","choices","correctResponse","feedbackEnabled","numberedGuides","orientation","partialScoring","placementArea","prompt","promptEnabled","rationale","rationaleEnabled","removeTilesAfterPlacing","scoringType","studentInstructionsEnabled","targetLabel","teacherInstructions","teacherInstructionsEnabled","toolbarEditorPosition"],"mappings":";;;;;;eAAe;AACbA,EAAAA,WAAW,EAAE,EADA;AAEbC,EAAAA,kBAAkB,EAAE,IAFP;AAGbC,EAAAA,OAAO,EAAE,EAHI;AAIbC,EAAAA,eAAe,EAAE,EAJJ;AAKbC,EAAAA,eAAe,EAAE,KALJ;AAMbC,EAAAA,cAAc,EAAE,KANH;AAObC,EAAAA,WAAW,EAAE,UAPA;AAQbC,EAAAA,cAAc,EAAE,IARH;AASbC,EAAAA,aAAa,EAAE,KATF;AAUbC,EAAAA,MAAM,EAAE,EAVK;AAWbC,EAAAA,aAAa,EAAE,IAXF;AAYbC,EAAAA,SAAS,EAAE,EAZE;AAabC,EAAAA,gBAAgB,EAAE,IAbL;AAcbC,EAAAA,uBAAuB,EAAE,IAdZ;AAebC,EAAAA,WAAW,EAAE,MAfA;AAgBbC,EAAAA,0BAA0B,EAAE,IAhBf;AAiBbC,EAAAA,WAAW,EAAE,EAjBA;AAkBbC,EAAAA,mBAAmB,EAAE,EAlBR;AAmBbC,EAAAA,0BAA0B,EAAE,IAnBf;AAoBbC,EAAAA,qBAAqB,EAAE;AApBV,C","sourcesContent":["export default {\n  choiceLabel: '',\n  choiceLabelEnabled: true,\n  choices: [],\n  correctResponse: [],\n  feedbackEnabled: false,\n  numberedGuides: false,\n  orientation: 'vertical',\n  partialScoring: true,\n  placementArea: false,\n  prompt: '',\n  promptEnabled: true,\n  rationale: '',\n  rationaleEnabled: true,\n  removeTilesAfterPlacing: true,\n  scoringType: 'auto',\n  studentInstructionsEnabled: true,\n  targetLabel: '',\n  teacherInstructions: '',\n  teacherInstructionsEnabled: true,\n  toolbarEditorPosition: 'bottom',\n};\n"],"file":"defaults.js"}
+{"version":3,"file":"defaults.js","names":["choiceLabel","choiceLabelEnabled","choices","correctResponse","feedbackEnabled","numberedGuides","orientation","partialScoring","placementArea","prompt","promptEnabled","rationale","rationaleEnabled","removeTilesAfterPlacing","scoringType","studentInstructionsEnabled","targetLabel","teacherInstructions","teacherInstructionsEnabled","toolbarEditorPosition"],"sources":["../src/defaults.js"],"sourcesContent":["export default {\n  choiceLabel: '',\n  choiceLabelEnabled: true,\n  choices: [],\n  correctResponse: [],\n  feedbackEnabled: false,\n  numberedGuides: false,\n  orientation: 'vertical',\n  partialScoring: true,\n  placementArea: false,\n  prompt: '',\n  promptEnabled: true,\n  rationale: '',\n  rationaleEnabled: true,\n  removeTilesAfterPlacing: true,\n  scoringType: 'auto',\n  studentInstructionsEnabled: true,\n  targetLabel: '',\n  teacherInstructions: '',\n  teacherInstructionsEnabled: true,\n  toolbarEditorPosition: 'bottom',\n};\n"],"mappings":";;;;;;iCAAe;EACbA,WAAW,EAAE,EAAE;EACfC,kBAAkB,EAAE,IAAI;EACxBC,OAAO,EAAE,EAAE;EACXC,eAAe,EAAE,EAAE;EACnBC,eAAe,EAAE,KAAK;EACtBC,cAAc,EAAE,KAAK;EACrBC,WAAW,EAAE,UAAU;EACvBC,cAAc,EAAE,IAAI;EACpBC,aAAa,EAAE,KAAK;EACpBC,MAAM,EAAE,EAAE;EACVC,aAAa,EAAE,IAAI;EACnBC,SAAS,EAAE,EAAE;EACbC,gBAAgB,EAAE,IAAI;EACtBC,uBAAuB,EAAE,IAAI;EAC7BC,WAAW,EAAE,MAAM;EACnBC,0BAA0B,EAAE,IAAI;EAChCC,WAAW,EAAE,EAAE;EACfC,mBAAmB,EAAE,EAAE;EACvBC,0BAA0B,EAAE,IAAI;EAChCC,qBAAqB,EAAE;AACzB,CAAC","ignoreList":[]}

package/controller/lib/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,61 +10,35 @@ exports.model = model;
 exports.normalize = void 0;
 exports.outcome = outcome;
 exports.validate = exports.questionError = void 0;
-
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _scoring = require("./scoring");
-
 var _lodash = _interopRequireDefault(require("lodash"));
-
 var _feedback = require("@pie-lib/feedback");
-
 var _controllerUtils = require("@pie-lib/controller-utils");
-
 var _debug = _interopRequireDefault(require("debug"));
-
 var _defaults = _interopRequireDefault(require("./defaults"));
-
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
-
 var _isEmpty = _interopRequireDefault(require("lodash/isEmpty"));
-
 var _translator = _interopRequireDefault(require("@pie-lib/translator"));
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-var log = (0, _debug["default"])('@pie-element:placement-ordering:controller');
-var translator = _translator["default"].translator;
-
-var questionError = function questionError() {
-  return new Error('Question is missing required array: correctResponse');
-};
-
+const log = (0, _debug.default)('@pie-element:placement-ordering:controller');
+const {
+  translator
+} = _translator.default;
+const questionError = () => new Error('Question is missing required array: correctResponse');
 exports.questionError = questionError;
-
 function outcome(question, session, env) {
-  return new Promise(function (resolve, reject) {
-    if (!session || _lodash["default"].isEmpty(session)) {
+  return new Promise((resolve, reject) => {
+    if (!session || _lodash.default.isEmpty(session)) {
       resolve({
         score: 0,
         empty: true
       });
     }
-
-    if (!question || !question.correctResponse || _lodash["default"].isEmpty(question.correctResponse)) {
+    if (!question || !question.correctResponse || _lodash.default.isEmpty(question.correctResponse)) {
       reject(questionError());
     } else {
       try {
-        var s = (0, _scoring.score)(question, session);
-        var finalScore = _controllerUtils.partialScoring.enabled(question, env || {}) ? s : s === 1 ? 1 : 0;
+        const s = (0, _scoring.score)(question, session);
+        const finalScore = _controllerUtils.partialScoring.enabled(question, env || {}) ? s : s === 1 ? 1 : 0;
         resolve({
           score: finalScore
         });
@@ -75,155 +48,115 @@ function outcome(question, session, env) {
     }
   });
 }
-
-function createDefaultModel() {
-  var model = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  return new Promise(function (resolve) {
-    resolve(_objectSpread(_objectSpread({}, _defaults["default"]), model));
+function createDefaultModel(model = {}) {
+  return new Promise(resolve => {
+    resolve({
+      ..._defaults.default,
+      ...model
+    });
   });
 }
+const normalize = question => ({
+  ..._defaults.default,
+  rationaleEnabled: true,
+  feedbackEnabled: false,
+  promptEnabled: true,
+  teacherInstructionsEnabled: true,
+  studentInstructionsEnabled: true,
+  ...question
+});
 
-var normalize = function normalize(question) {
-  return _objectSpread(_objectSpread({}, _defaults["default"]), {}, {
-    rationaleEnabled: true,
-    feedbackEnabled: false,
-    promptEnabled: true,
-    teacherInstructionsEnabled: true,
-    studentInstructionsEnabled: true
-  }, question);
-};
 /**
  *
  * @param {*} question
  * @param {*} session
  * @param {*} env
  */
-
-
 exports.normalize = normalize;
+async function model(question, session, env) {
+  const normalizedQuestion = normalize(question);
+  const base = {};
+  if (question.alternateResponses && _lodash.default.every(question.alternateResponses, _lodash.default.isArray)) {
+    log('Deprecated structure of alternateResponses is in use');
+    // eslint-disable-next-line no-console
+    console.error('Deprecated structure of alternateResponses is in use');
+  }
+  base.env = env;
+  base.extraCSSRules = normalizedQuestion.extraCSSRules;
+  base.outcomes = [];
+  base.completeLength = (normalizedQuestion.correctResponse || []).length;
+  base.choices = (normalizedQuestion.choices || []).filter(choice => choice.label);
+  base.note = normalizedQuestion.note;
+  base.showNote = normalizedQuestion.alternateResponses && normalizedQuestion.alternateResponses.length > 0;
+  base.language = normalizedQuestion.language;
+  log('[model] removing tileSize for the moment.');
+  base.prompt = normalizedQuestion.promptEnabled ? normalizedQuestion.prompt : null;
+  base.config = {
+    orientation: normalizedQuestion.orientation || 'vertical',
+    includeTargets: normalizedQuestion.placementArea,
+    choiceLabelEnabled: normalizedQuestion.choiceLabelEnabled,
+    targetLabel: normalizedQuestion.targetLabel,
+    choiceLabel: normalizedQuestion.choiceLabel,
+    showOrdering: normalizedQuestion.numberedGuides,
+    allowSameChoiceInTargets: !normalizedQuestion.removeTilesAfterPlacing
+  };
+  base.disabled = env.mode !== 'gather';
+  if (!base.note) {
+    base.note = translator.t('common:commonCorrectAnswerWithAlternates', {
+      lng: normalizedQuestion.language
+    });
+  }
+  if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {
+    base.rationale = normalizedQuestion.rationaleEnabled ? normalizedQuestion.rationale : null;
+    base.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled ? normalizedQuestion.teacherInstructions : null;
+  } else {
+    base.rationale = null;
+    base.teacherInstructions = null;
+  }
+  if (env.mode === 'evaluate') {
+    const value = session && session.value || [];
+    const allCorrectResponses = (0, _scoring.getAllCorrectResponses)(normalizedQuestion);
+    const bestSetOfResponses = allCorrectResponses.reduce((info, cr) => {
+      const currentScore = _lodash.default.reduce(value, (acc, c, idx) => acc + (Array.isArray(cr) && cr[idx] === c ? 1 : 0), 0);
+      if (currentScore > info.score) {
+        return {
+          arr: cr,
+          score: currentScore
+        };
+      }
+      return info;
+    }, {
+      arr: [],
+      score: 0
+    });
+    base.outcomes = _lodash.default.map(value, (c, idx) => {
+      return {
+        id: c,
+        outcome: bestSetOfResponses.arr[idx] === c ? 'correct' : 'incorrect'
+      };
+    });
+    const isResponseCorrect = allCorrectResponses.some(response => _lodash.default.isEqual(response, value));
+    const responseScore = (0, _scoring.score)(question, session);
+    const isCorrect = responseScore === 1;
+    const isPartialCorrect = !isCorrect && _controllerUtils.partialScoring.enabled(normalizedQuestion, env || {}) && responseScore !== 0;
+    base.correctness = isCorrect ? 'correct' : isPartialCorrect ? 'partial' : 'incorrect';
+    if (!isResponseCorrect) {
+      base.correctResponse = (0, _scoring.flattenCorrect)(normalizedQuestion);
+    }
 
-function model(question, session, env) {
-  return new Promise( /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(resolve) {
-      var normalizedQuestion, base, value, allCorrectResponses, bestSetOfResponses, isResponseCorrect, responseScore, isCorrect, isPartialCorrect, fb;
-      return _regenerator["default"].wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
-              normalizedQuestion = normalize(question);
-              base = {};
-
-              if (question.alternateResponses && _lodash["default"].every(question.alternateResponses, _lodash["default"].isArray)) {
-                log('Deprecated structure of alternateResponses is in use'); // eslint-disable-next-line no-console
-
-                console.error('Deprecated structure of alternateResponses is in use');
-              }
-
-              base.env = env;
-              base.extraCSSRules = normalizedQuestion.extraCSSRules;
-              base.outcomes = [];
-              base.completeLength = (normalizedQuestion.correctResponse || []).length;
-              base.choices = (normalizedQuestion.choices || []).filter(function (choice) {
-                return choice.label;
-              });
-              base.note = normalizedQuestion.note;
-              base.showNote = normalizedQuestion.alternateResponses && normalizedQuestion.alternateResponses.length > 0;
-              base.language = normalizedQuestion.language;
-              log('[model] removing tileSize for the moment.');
-              base.prompt = normalizedQuestion.promptEnabled ? normalizedQuestion.prompt : null;
-              base.config = {
-                orientation: normalizedQuestion.orientation || 'vertical',
-                includeTargets: normalizedQuestion.placementArea,
-                choiceLabelEnabled: normalizedQuestion.choiceLabelEnabled,
-                targetLabel: normalizedQuestion.targetLabel,
-                choiceLabel: normalizedQuestion.choiceLabel,
-                showOrdering: normalizedQuestion.numberedGuides,
-                allowSameChoiceInTargets: !normalizedQuestion.removeTilesAfterPlacing
-              };
-              base.disabled = env.mode !== 'gather';
-
-              if (!base.note) {
-                base.note = translator.t('common:commonCorrectAnswerWithAlternates', {
-                  lng: normalizedQuestion.language
-                });
-              }
-
-              if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {
-                base.rationale = normalizedQuestion.rationaleEnabled ? normalizedQuestion.rationale : null;
-                base.teacherInstructions = normalizedQuestion.teacherInstructionsEnabled ? normalizedQuestion.teacherInstructions : null;
-              } else {
-                base.rationale = null;
-                base.teacherInstructions = null;
-              }
-
-              if (env.mode === 'evaluate') {
-                value = session && session.value || [];
-                allCorrectResponses = (0, _scoring.getAllCorrectResponses)(normalizedQuestion);
-                bestSetOfResponses = allCorrectResponses.reduce(function (info, cr) {
-                  var currentScore = _lodash["default"].reduce(value, function (acc, c, idx) {
-                    return acc + (Array.isArray(cr) && cr[idx] === c ? 1 : 0);
-                  }, 0);
-
-                  if (currentScore > info.score) {
-                    return {
-                      arr: cr,
-                      score: currentScore
-                    };
-                  }
-
-                  return info;
-                }, {
-                  arr: [],
-                  score: 0
-                });
-                base.outcomes = _lodash["default"].map(value, function (c, idx) {
-                  return {
-                    id: c,
-                    outcome: bestSetOfResponses.arr[idx] === c ? 'correct' : 'incorrect'
-                  };
-                });
-                isResponseCorrect = allCorrectResponses.some(function (response) {
-                  return _lodash["default"].isEqual(response, value);
-                });
-                responseScore = (0, _scoring.score)(question, session);
-                isCorrect = responseScore === 1;
-                isPartialCorrect = !isCorrect && _controllerUtils.partialScoring.enabled(normalizedQuestion, env || {}) && responseScore !== 0;
-                base.correctness = isCorrect ? 'correct' : isPartialCorrect ? 'partial' : 'incorrect';
-
-                if (!isResponseCorrect) {
-                  base.correctResponse = (0, _scoring.flattenCorrect)(normalizedQuestion);
-                } // requirement made in PD-2182
-
-
-                if (!normalizedQuestion.feedback) {
-                  normalizedQuestion.feedbackEnabled = false;
-                }
-
-                fb = normalizedQuestion.feedbackEnabled ? (0, _feedback.getFeedbackForCorrectness)(base.correctness, normalizedQuestion.feedback) : Promise.resolve(undefined);
-                fb.then(function (feedback) {
-                  base.feedback = feedback;
-                  resolve(base);
-                });
-              } else {
-                resolve(base);
-              }
-
-            case 18:
-            case "end":
-              return _context.stop();
-          }
-        }
-      }, _callee);
-    }));
-
-    return function (_x) {
-      return _ref.apply(this, arguments);
-    };
-  }());
+    // requirement made in PD-2182
+    if (!normalizedQuestion.feedback) {
+      normalizedQuestion.feedbackEnabled = false;
+    }
+    const feedback = normalizedQuestion.feedbackEnabled ? await (0, _feedback.getFeedbackForCorrectness)(base.correctness, normalizedQuestion.feedback) : undefined;
+    base.feedback = feedback;
+    return base;
+  } else {
+    return base;
+  }
 }
-
-var createCorrectResponseSession = function createCorrectResponseSession(question, env) {
-  return new Promise(function (resolve) {
+const createCorrectResponseSession = (question, env) => {
+  return new Promise(resolve => {
     if (env.mode !== 'evaluate' && env.role === 'instructor') {
       resolve({
         id: '1',
@@ -233,68 +166,50 @@ var createCorrectResponseSession = function createCorrectResponseSession(questio
       resolve(null);
     }
   });
-}; // remove all html tags
-
-
-exports.createCorrectResponseSession = createCorrectResponseSession;
-
-var getInnerText = function getInnerText(html) {
-  return (html || '').replaceAll(/<[^>]*>/g, '');
-}; // remove all html tags except img, iframe and source tag for audio
-
-
-var getContent = function getContent(html) {
-  return (html || '').replace(/(<(?!img|iframe|source)([^>]+)>)/gi, '');
 };
 
-var validate = function validate() {
-  var model = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var config = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var choices = model.choices,
-      correctResponse = model.correctResponse;
-  var errors = {};
-  ['teacherInstructions', 'prompt', 'rationale'].forEach(function (field) {
-    var _config$field;
-
-    if ((_config$field = config[field]) !== null && _config$field !== void 0 && _config$field.required && !getContent(model[field])) {
+// remove all html tags
+exports.createCorrectResponseSession = createCorrectResponseSession;
+const getInnerText = html => (html || '').replaceAll(/<[^>]*>/g, '');
+
+// remove all html tags except img, iframe and source tag for audio
+const getContent = html => (html || '').replace(/(<(?!img|iframe|source)([^>]+)>)/gi, '');
+const validate = (model = {}, config = {}) => {
+  const {
+    choices,
+    correctResponse
+  } = model;
+  const errors = {};
+  ['teacherInstructions', 'prompt', 'rationale'].forEach(field => {
+    if (config[field]?.required && !getContent(model[field])) {
       errors[field] = 'This field is required.';
     }
   });
-  var reversedChoices = (0, _toConsumableArray2["default"])(choices || []).reverse();
-  var choicesErrors = {};
-  reversedChoices.forEach(function (choice, index) {
-    var id = choice.id,
-        label = choice.label;
-
+  const reversedChoices = [...(choices || [])].reverse();
+  const choicesErrors = {};
+  reversedChoices.forEach((choice, index) => {
+    const {
+      id,
+      label
+    } = choice;
     if (!getContent(label)) {
       choicesErrors[id] = 'Content should not be empty.';
     } else {
-      var identicalAnswer = reversedChoices.slice(index + 1).some(function (c) {
-        return c.label === label;
-      });
-
+      const identicalAnswer = reversedChoices.slice(index + 1).some(c => c.label === label);
       if (identicalAnswer) {
         choicesErrors[id] = 'Content should be unique.';
       }
     }
   });
-  var choicesIds = (choices || []).map(function (choice) {
-    return choice.id;
-  });
-  var correctResponseIds = (correctResponse || []).map(function (response) {
-    return response.id || response;
-  });
-
-  if ((0, _isEqual["default"])(choicesIds, correctResponseIds)) {
+  const choicesIds = (choices || []).map(choice => choice.id);
+  const correctResponseIds = (correctResponse || []).map(response => response.id || response);
+  if ((0, _isEqual.default)(choicesIds, correctResponseIds)) {
     errors.orderError = 'The correct ordering should not be identical to the initial ordering.';
   }
-
-  if (!(0, _isEmpty["default"])(choicesErrors)) {
+  if (!(0, _isEmpty.default)(choicesErrors)) {
     errors.choicesErrors = choicesErrors;
   }
-
   return errors;
 };
-
 exports.validate = validate;
 //# sourceMappingURL=index.js.map