@pie-element/graphing 4.13.4-next.75 → 4.13.4-next.81

package/controller/lib/index.js

@@ -13,10 +13,10 @@ exports.validate = void 0;
 
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 
 var _debug = _interopRequireDefault(require("debug"));
@@ -74,24 +74,22 @@ var getAnswerCorrected = function getAnswerCorrected(_ref) {
     });
     answer.correctness = answerIsCorrect ? 'correct' : 'incorrect';
     return [].concat((0, _toConsumableArray2["default"])(correctedAnswer), [answer]);
-  }, []);
-  var missingAnswers = []; // mark missing correct answers as incorrect
-
-  if (rez.length < sessionAnswers.length) {
-    missingAnswers = (0, _cloneDeep["default"])(correctAnswers).reduce(function (correctedAnswer, answer) {
-      var answerIndex = sessionAnswers.find(function (mark) {
-        return compareMarks(answer, mark);
-      }); // means that corrected answer is missing from session, so we mark it as missing/incorrect object
+  }, []); // add missing objects from correct answer
 
-      if (!answerIndex) {
-        answer.correctness = 'incorrect';
-        return [].concat((0, _toConsumableArray2["default"])(correctedAnswer), [answer]);
-      }
+  var missingAnswers = (0, _cloneDeep["default"])(correctAnswers).reduce(function (correctedAnswer, answer) {
+    var answerIndex = sessionAnswers.find(function (mark) {
+      return compareMarks(answer, mark);
+    });
 
-      return (0, _toConsumableArray2["default"])(correctedAnswer);
-    }, []);
-  }
+    if (!answerIndex) {
+      // means that corrected answer is missing from session, so we mark it as missing object
+      return [].concat((0, _toConsumableArray2["default"])(correctedAnswer), [_objectSpread(_objectSpread({}, answer), {}, {
+        correctness: 'missing'
+      })]);
+    }
 
+    return correctedAnswer;
+  }, []);
   return [].concat((0, _toConsumableArray2["default"])(rez), (0, _toConsumableArray2["default"])(missingAnswers));
 };
 
@@ -175,12 +173,17 @@ var getBestAnswer = function getBestAnswer(question, session) {
     });
     var correctMarks = correctedAnswer.filter(function (answer) {
       return answer.correctness === 'correct';
+    }); // filter out missing objects because they do not affect the calculation of the score
+    // only correct and incorrect are needed
+
+    var scoredCorrectedAnswer = correctedAnswer.filter(function (answer) {
+      return answer.correctness !== 'missing';
     });
     var maxScore = marks.length;
     var score = correctMarks.length; // if extra placements
 
-    if (correctedAnswer.length > maxScore) {
-      score -= correctedAnswer.length - maxScore;
+    if (scoredCorrectedAnswer.length > maxScore) {
+      score -= scoredCorrectedAnswer.length - maxScore;
     }
 
     if (score < 0) {

package/controller/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.js"],"names":["log","initializeGraphMap","point","segment","line","ray","vector","polygon","circle","sine","parabola","compareMarks","mark1","mark2","type","equalMarks","getAnswerCorrected","sessionAnswers","correctAnswers","marks","rez","reduce","correctedAnswer","answer","answerIsCorrect","find","mark","correctness","missingAnswers","length","answerIndex","getPartialScoring","scoringType","env","pS","partialScoring","enabled","getBestAnswer","question","session","answers","questionPossibleAnswers","Object","entries","forEach","key","value","filter","building","correctAnswer","partialScoringEnabled","possibleAnswers","acc","entry","possibleAnswerKey","possibleAnswer","correctMarks","maxScore","score","bestScore","foundOneSolution","parseFloat","toFixed","Math","floor","bestScoreAnswerKey","answersCorrected","map","normalize","defaults","model","Promise","resolve","normalizedQuestion","defaultTool","prompt","promptEnabled","graph","toolbarTools","questionProps","arrows","mode","role","left","right","up","down","toolbarToolsNoLabel","tool","normalizedDefaultTool","base","disabled","rationale","size","showToggle","teacherInstructions","rationaleEnabled","teacherInstructionsEnabled","correctResponse","outcome","empty","createCorrectResponseSession","values","id","validate","errors","correctAnswerErrors","toolbarToolsError"],"mappings":"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","sourcesContent":["import debug from 'debug';\n\nimport cloneDeep from 'lodash/cloneDeep';\nimport uniqWith from 'lodash/uniqWith';\nimport isEmpty from 'lodash/isEmpty';\nimport defaults from './defaults';\nimport { equalMarks, sortedAnswers } from './utils';\n\nimport { partialScoring } from '@pie-lib/controller-utils';\n\nconst log = debug('@pie-element:graphing:controller');\n\nconst initializeGraphMap = () => ({\n  point: [],\n  segment: [],\n  line: [],\n  ray: [],\n  vector: [],\n  polygon: [],\n  circle: [],\n  sine: [],\n  parabola: [],\n});\n\nexport const compareMarks = (mark1, mark2) => {\n  // marks can be compared with equalMarks[type] function only if they have the same type;\n  // if type is different, they are clearly not equal\n  return !!(\n    mark1 &&\n    mark2 &&\n    mark1.type === mark2.type &&\n    equalMarks[mark1.type] &&\n    equalMarks[mark1.type](mark1, mark2)\n  );\n};\n\nexport const getAnswerCorrected = ({ sessionAnswers, marks: correctAnswers }) => {\n  sessionAnswers = sessionAnswers || [];\n  correctAnswers = correctAnswers || [];\n\n  const rez = cloneDeep(sessionAnswers).reduce((correctedAnswer, answer) => {\n    const answerIsCorrect = correctAnswers.find((mark) => compareMarks(answer, mark));\n\n    answer.correctness = answerIsCorrect ? 'correct' : 'incorrect';\n\n    return [...correctedAnswer, answer];\n  }, []);\n\n  let missingAnswers =[];\n  // mark missing correct answers as incorrect\n  if (rez.length < sessionAnswers.length) {\n      missingAnswers = cloneDeep(correctAnswers).reduce((correctedAnswer, answer) => {\n      const answerIndex = sessionAnswers.find((mark) => compareMarks(answer, mark));\n      // means that corrected answer is missing from session, so we mark it as missing/incorrect object\n      if (!answerIndex) {\n        answer.correctness = 'incorrect';\n        return [...correctedAnswer, answer];\n      }\n      return [...correctedAnswer];\n    }, []);\n  }\n\n  return [...rez, ...missingAnswers];\n};\n\nconst getPartialScoring = ({ scoringType, env }) => {\n  let pS = scoringType;\n\n  // if scoringType is undefined, partialScoring should be considered undefined (not set)\n  // because partialScoring.enabled is using that information\n  // if it has a value, we check if it is partial scoring or dichotomous\n  if (scoringType) {\n    pS = scoringType === 'partial scoring';\n  }\n\n  return partialScoring.enabled({ partialScoring: pS }, env);\n};\n\nexport const getBestAnswer = (question, session, env = {}) => {\n  // questionPossibleAnswers contains all possible answers (correct response and alternates);\n  let { answers: questionPossibleAnswers = {}, scoringType } = question || {};\n  let { answer } = session || {};\n\n  // filter the incomplete objects\n  Object.entries(questionPossibleAnswers || {}).forEach(\n    ([key, value]) =>\n      (questionPossibleAnswers[key] = { ...value, marks: value?.marks.filter((mark) => !mark.building) }),\n  );\n\n  // initialize answer if no values\n  answer = answer || [];\n\n  // initialize one possible answer if no values\n  if (isEmpty(questionPossibleAnswers)) {\n    questionPossibleAnswers = { correctAnswer: initializeGraphMap() };\n  } else {\n    questionPossibleAnswers = {\n      correctAnswer: questionPossibleAnswers.correctAnswer,\n      ...sortedAnswers(questionPossibleAnswers),\n    };\n  }\n\n  const partialScoringEnabled = getPartialScoring({ scoringType, env });\n\n  // student's answers without DUPLICATES\n  const sessionAnswers = uniqWith(answer, compareMarks);\n  // array of possible answers entries\n  const possibleAnswers = Object.entries(questionPossibleAnswers);\n\n  return possibleAnswers.reduce(\n    (acc, entry) => {\n      // iterating each possible answer (main + alternates)\n      const possibleAnswerKey = entry[0];\n      const possibleAnswer = entry[1] || {};\n      let { marks } = possibleAnswer;\n\n      if (!marks || !marks.length) {\n        return acc;\n      }\n\n      // returns array of marks, each having 'correctness' property\n      const correctedAnswer = getAnswerCorrected({ sessionAnswers, marks });\n      const correctMarks = correctedAnswer.filter((answer) => answer.correctness === 'correct');\n\n      const maxScore = marks.length;\n      let score = correctMarks.length;\n\n      // if extra placements\n      if (correctedAnswer.length > maxScore) {\n        score -= correctedAnswer.length - maxScore;\n      }\n\n      if (score < 0) {\n        score = 0;\n      }\n\n      if (score / maxScore > acc.bestScore || !acc.foundOneSolution) {\n        if (partialScoringEnabled) {\n          acc.bestScore = parseFloat((score / maxScore).toFixed(2));\n        } else {\n          acc.bestScore = Math.floor(score / maxScore);\n        }\n\n        acc.bestScoreAnswerKey = possibleAnswerKey;\n        acc.answersCorrected = correctedAnswer;\n        acc.foundOneSolution = true;\n      }\n\n      return acc;\n    },\n    {\n      bestScore: 0,\n      bestScoreAnswerKey: null,\n      // initially we just suppose all the answers are incorrect\n      answersCorrected: cloneDeep(sessionAnswers).map((answer) => ({ ...answer, correctness: 'incorrect' })),\n      foundOneSolution: false,\n    },\n  );\n};\n\nexport const normalize = (question) => ({ ...defaults, ...question });\n\nexport function model(question, session, env) {\n  return new Promise((resolve) => {\n    const normalizedQuestion = normalize(question);\n    const { defaultTool, prompt, promptEnabled, graph, answers, toolbarTools, ...questionProps } =\n      normalizedQuestion || {};\n    let { arrows } = normalizedQuestion;\n    const { mode, role } = env || {};\n\n    // This is used for offering support for old models which have the property arrows: boolean\n    // Same thing is set in authoring : packages/graphing/configure/src/configure.jsx - componentDidMount\n    if (typeof arrows === 'boolean') {\n      if (arrows) {\n        arrows = {\n          left: true,\n          right: true,\n          up: true,\n          down: true,\n        };\n      } else {\n        arrows = {\n          left: false,\n          right: false,\n          up: false,\n          down: false,\n        };\n      }\n    }\n\n    // added support for models without defaultTool defined; also used in packages/graphing/configure/src/index.js\n    const toolbarToolsNoLabel = (toolbarTools || []).filter((tool) => tool !== 'label');\n    const normalizedDefaultTool = defaultTool || (toolbarToolsNoLabel.length && toolbarToolsNoLabel[0]) || '';\n\n    const base = {\n      ...questionProps,\n      answers,\n      arrows,\n      defaultTool: normalizedDefaultTool,\n      disabled: env.mode !== 'gather',\n      prompt: promptEnabled ? prompt : null,\n      rationale: null,\n      size: graph,\n      showToggle:\n        env.mode === 'evaluate' &&\n        !isEmpty(answers) &&\n        answers.correctAnswer &&\n        answers.correctAnswer.marks &&\n        !isEmpty(answers.correctAnswer.marks),\n      teacherInstructions: null,\n      toolbarTools,\n    };\n\n    if (role === 'instructor' && (mode === 'view' || mode === 'evaluate')) {\n      const { rationale, rationaleEnabled, teacherInstructions, teacherInstructionsEnabled } = normalizedQuestion || {};\n\n      base.rationale = rationaleEnabled ? rationale : null;\n      base.teacherInstructions = teacherInstructionsEnabled ? teacherInstructions : null;\n    }\n\n    if (mode === 'evaluate') {\n      if (\n        !isEmpty(answers) &&\n        answers.correctAnswer &&\n        answers.correctAnswer.marks &&\n        !isEmpty(answers.correctAnswer.marks)\n      ) {\n        const { answersCorrected, bestScoreAnswerKey, bestScore } = getBestAnswer(normalizedQuestion, session, env);\n        // array of marks from session with 'correctness' property set\n        base.answersCorrected = answersCorrected;\n        base.correctResponse = bestScoreAnswerKey ? (answers[bestScoreAnswerKey] || {}).marks : [];\n        base.showToggle = base.showToggle && bestScore !== 1;\n      } else {\n        base.answersCorrected = (session && session.answer) || [];\n        base.correctResponse = [];\n      }\n    }\n\n    log('base: ', base);\n    resolve(base);\n  });\n}\n\nexport function outcome(question, session, env = {}) {\n  return new Promise((resolve) => {\n    if (!session || isEmpty(session)) {\n      resolve({ score: 0, empty: true });\n    }\n\n    if (\n      env.mode !== 'evaluate' ||\n      isEmpty(question.answers) ||\n      (question.answers && question.answers.correctAnswer && isEmpty(question.answers.correctAnswer.marks))\n    ) {\n      resolve({ score: 0 });\n    }\n\n    const { bestScore } = getBestAnswer(question, session, env);\n\n    resolve({ score: bestScore });\n  });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { answers } = question || {};\n      let marks = [];\n\n      if (answers && Object.values(answers)) {\n        const correctAnswer = answers.correctAnswer || Object.values(answers)[0] || {};\n        marks = correctAnswer.marks || [];\n      }\n\n      resolve({\n        answer: marks,\n        id: '1',\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n\nexport const validate = (model = {}) => {\n  const { answers, toolbarTools } = model;\n  const errors = {};\n  const correctAnswerErrors = {};\n  const toolbarToolsNoLabel = (toolbarTools || []).filter((tool) => tool !== 'label');\n\n  if (!toolbarToolsNoLabel.length) {\n    errors.toolbarToolsError = 'There should be at least 1 tool defined.';\n  }\n\n  Object.entries(answers || {}).forEach(([key, value]) => {\n    if (!value.marks.length) {\n      correctAnswerErrors[key] = 'At least 1 graph object should be defined.';\n    }\n  });\n\n  if (!isEmpty(correctAnswerErrors)) {\n    errors.correctAnswerErrors = correctAnswerErrors;\n  }\n\n  return errors;\n};\n"],"file":"index.js"}
+{"version":3,"sources":["../src/index.js"],"names":["log","initializeGraphMap","point","segment","line","ray","vector","polygon","circle","sine","parabola","compareMarks","mark1","mark2","type","equalMarks","getAnswerCorrected","sessionAnswers","correctAnswers","marks","rez","reduce","correctedAnswer","answer","answerIsCorrect","find","mark","correctness","missingAnswers","answerIndex","getPartialScoring","scoringType","env","pS","partialScoring","enabled","getBestAnswer","question","session","answers","questionPossibleAnswers","Object","entries","forEach","key","value","filter","building","correctAnswer","partialScoringEnabled","possibleAnswers","acc","entry","possibleAnswerKey","possibleAnswer","length","correctMarks","scoredCorrectedAnswer","maxScore","score","bestScore","foundOneSolution","parseFloat","toFixed","Math","floor","bestScoreAnswerKey","answersCorrected","map","normalize","defaults","model","Promise","resolve","normalizedQuestion","defaultTool","prompt","promptEnabled","graph","toolbarTools","questionProps","arrows","mode","role","left","right","up","down","toolbarToolsNoLabel","tool","normalizedDefaultTool","base","disabled","rationale","size","showToggle","teacherInstructions","rationaleEnabled","teacherInstructionsEnabled","correctResponse","outcome","empty","createCorrectResponseSession","values","id","validate","errors","correctAnswerErrors","toolbarToolsError"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;AAEA;;AACA;;AACA;;AACA;;AACA;;AAEA;;;;;;;;AAEA,IAAMA,GAAG,GAAG,uBAAM,kCAAN,CAAZ;;AAEA,IAAMC,kBAAkB,GAAG,SAArBA,kBAAqB;AAAA,SAAO;AAChCC,IAAAA,KAAK,EAAE,EADyB;AAEhCC,IAAAA,OAAO,EAAE,EAFuB;AAGhCC,IAAAA,IAAI,EAAE,EAH0B;AAIhCC,IAAAA,GAAG,EAAE,EAJ2B;AAKhCC,IAAAA,MAAM,EAAE,EALwB;AAMhCC,IAAAA,OAAO,EAAE,EANuB;AAOhCC,IAAAA,MAAM,EAAE,EAPwB;AAQhCC,IAAAA,IAAI,EAAE,EAR0B;AAShCC,IAAAA,QAAQ,EAAE;AATsB,GAAP;AAAA,CAA3B;;AAYO,IAAMC,YAAY,GAAG,SAAfA,YAAe,CAACC,KAAD,EAAQC,KAAR,EAAkB;AAC5C;AACA;AACA,SAAO,CAAC,EACND,KAAK,IACLC,KADA,IAEAD,KAAK,CAACE,IAAN,KAAeD,KAAK,CAACC,IAFrB,IAGAC,kBAAWH,KAAK,CAACE,IAAjB,CAHA,IAIAC,kBAAWH,KAAK,CAACE,IAAjB,EAAuBF,KAAvB,EAA8BC,KAA9B,CALM,CAAR;AAOD,CAVM;;;;AAYA,IAAMG,kBAAkB,GAAG,SAArBA,kBAAqB,OAA+C;AAAA,MAA5CC,cAA4C,QAA5CA,cAA4C;AAAA,MAArBC,cAAqB,QAA5BC,KAA4B;AAC/EF,EAAAA,cAAc,GAAGA,cAAc,IAAI,EAAnC;AACAC,EAAAA,cAAc,GAAGA,cAAc,IAAI,EAAnC;AAEA,MAAME,GAAG,GAAG,2BAAUH,cAAV,EAA0BI,MAA1B,CAAiC,UAACC,eAAD,EAAkBC,MAAlB,EAA6B;AACxE,QAAMC,eAAe,GAAGN,cAAc,CAACO,IAAf,CAAoB,UAACC,IAAD;AAAA,aAAUf,YAAY,CAACY,MAAD,EAASG,IAAT,CAAtB;AAAA,KAApB,CAAxB;AAEAH,IAAAA,MAAM,CAACI,WAAP,GAAqBH,eAAe,GAAG,SAAH,GAAe,WAAnD;AAEA,yDAAWF,eAAX,IAA4BC,MAA5B;AACD,GANW,EAMT,EANS,CAAZ,CAJ+E,CAY/E;;AACA,MAAMK,cAAc,GAAG,2BAAUV,cAAV,EAA0BG,MAA1B,CAAiC,UAACC,eAAD,EAAkBC,MAAlB,EAA6B;AACnF,QAAMM,WAAW,GAAGZ,cAAc,CAACQ,IAAf,CAAoB,UAACC,IAAD;AAAA,aAAUf,YAAY,CAACY,MAAD,EAASG,IAAT,CAAtB;AAAA,KAApB,CAApB;;AAEA,QAAI,CAACG,WAAL,EAAkB;AAChB;AACA,2DAAWP,eAAX,oCAAiCC,MAAjC;AAAyCI,QAAAA,WAAW,EAAE;AAAtD;AACD;;AAED,WAAOL,eAAP;AACD,GATsB,EASpB,EAToB,CAAvB;AAWA,uDAAWF,GAAX,uCAAmBQ,cAAnB;AACD,CAzBM;;;;AA2BP,IAAME,iBAAiB,GAAG,SAApBA,iBAAoB,QAA0B;AAAA,MAAvBC,WAAuB,SAAvBA,WAAuB;AAAA,MAAVC,GAAU,SAAVA,GAAU;AAClD,MAAIC,EAAE,GAAGF,WAAT,CADkD,CAGlD;AACA;AACA;;AACA,MAAIA,WAAJ,EAAiB;AACfE,IAAAA,EAAE,GAAGF,WAAW,KAAK,iBAArB;AACD;;AAED,SAAOG,gCAAeC,OAAf,CAAuB;AAAED,IAAAA,cAAc,EAAED;AAAlB,GAAvB,EAA+CD,GAA/C,CAAP;AACD,CAXD;;AAaO,IAAMI,aAAa,GAAG,SAAhBA,aAAgB,CAACC,QAAD,EAAWC,OAAX,EAAiC;AAAA,MAAbN,GAAa,uEAAP,EAAO;;AAC5D;AACA,cAA6DK,QAAQ,IAAI,EAAzE;AAAA,4BAAME,OAAN;AAAA,MAAeC,uBAAf,8BAAyC,EAAzC;AAAA,MAA6CT,WAA7C,SAA6CA,WAA7C;;AACA,cAAiBO,OAAO,IAAI,EAA5B;AAAA,MAAMf,MAAN,SAAMA,MAAN,CAH4D,CAK5D;;;AACAkB,EAAAA,MAAM,CAACC,OAAP,CAAeF,uBAAuB,IAAI,EAA1C,EAA8CG,OAA9C,CACE;AAAA;AAAA,QAAEC,GAAF;AAAA,QAAOC,KAAP;;AAAA,WACGL,uBAAuB,CAACI,GAAD,CAAvB,mCAAoCC,KAApC;AAA2C1B,MAAAA,KAAK,EAAE0B,KAAF,aAAEA,KAAF,uBAAEA,KAAK,CAAE1B,KAAP,CAAa2B,MAAb,CAAoB,UAACpB,IAAD;AAAA,eAAU,CAACA,IAAI,CAACqB,QAAhB;AAAA,OAApB;AAAlD,MADH;AAAA,GADF,EAN4D,CAW5D;;AACAxB,EAAAA,MAAM,GAAGA,MAAM,IAAI,EAAnB,CAZ4D,CAc5D;;AACA,MAAI,yBAAQiB,uBAAR,CAAJ,EAAsC;AACpCA,IAAAA,uBAAuB,GAAG;AAAEQ,MAAAA,aAAa,EAAE/C,kBAAkB;AAAnC,KAA1B;AACD,GAFD,MAEO;AACLuC,IAAAA,uBAAuB;AACrBQ,MAAAA,aAAa,EAAER,uBAAuB,CAACQ;AADlB,OAElB,0BAAcR,uBAAd,CAFkB,CAAvB;AAID;;AAED,MAAMS,qBAAqB,GAAGnB,iBAAiB,CAAC;AAAEC,IAAAA,WAAW,EAAXA,WAAF;AAAeC,IAAAA,GAAG,EAAHA;AAAf,GAAD,CAA/C,CAxB4D,CA0B5D;;AACA,MAAMf,cAAc,GAAG,0BAASM,MAAT,EAAiBZ,YAAjB,CAAvB,CA3B4D,CA4B5D;;AACA,MAAMuC,eAAe,GAAGT,MAAM,CAACC,OAAP,CAAeF,uBAAf,CAAxB;AAEA,SAAOU,eAAe,CAAC7B,MAAhB,CACL,UAAC8B,GAAD,EAAMC,KAAN,EAAgB;AACd;AACA,QAAMC,iBAAiB,GAAGD,KAAK,CAAC,CAAD,CAA/B;AACA,QAAME,cAAc,GAAGF,KAAK,CAAC,CAAD,CAAL,IAAY,EAAnC;AACA,QAAMjC,KAAN,GAAgBmC,cAAhB,CAAMnC,KAAN;;AAEA,QAAI,CAACA,KAAD,IAAU,CAACA,KAAK,CAACoC,MAArB,EAA6B;AAC3B,aAAOJ,GAAP;AACD,KARa,CAUd;;;AACA,QAAM7B,eAAe,GAAGN,kBAAkB,CAAC;AAAEC,MAAAA,cAAc,EAAdA,cAAF;AAAkBE,MAAAA,KAAK,EAALA;AAAlB,KAAD,CAA1C;AACA,QAAMqC,YAAY,GAAGlC,eAAe,CAACwB,MAAhB,CAAuB,UAACvB,MAAD;AAAA,aAAYA,MAAM,CAACI,WAAP,KAAuB,SAAnC;AAAA,KAAvB,CAArB,CAZc,CAad;AACA;;AACA,QAAM8B,qBAAqB,GAAGnC,eAAe,CAACwB,MAAhB,CAAuB,UAACvB,MAAD;AAAA,aAAYA,MAAM,CAACI,WAAP,KAAuB,SAAnC;AAAA,KAAvB,CAA9B;AAEA,QAAM+B,QAAQ,GAAGvC,KAAK,CAACoC,MAAvB;AACA,QAAII,KAAK,GAAGH,YAAY,CAACD,MAAzB,CAlBc,CAoBd;;AACA,QAAIE,qBAAqB,CAACF,MAAtB,GAA+BG,QAAnC,EAA6C;AAC3CC,MAAAA,KAAK,IAAIF,qBAAqB,CAACF,MAAtB,GAA+BG,QAAxC;AACD;;AAED,QAAIC,KAAK,GAAG,CAAZ,EAAe;AACbA,MAAAA,KAAK,GAAG,CAAR;AACD;;AAED,QAAIA,KAAK,GAAGD,QAAR,GAAmBP,GAAG,CAACS,SAAvB,IAAoC,CAACT,GAAG,CAACU,gBAA7C,EAA+D;AAC7D,UAAIZ,qBAAJ,EAA2B;AACzBE,QAAAA,GAAG,CAACS,SAAJ,GAAgBE,UAAU,CAAC,CAACH,KAAK,GAAGD,QAAT,EAAmBK,OAAnB,CAA2B,CAA3B,CAAD,CAA1B;AACD,OAFD,MAEO;AACLZ,QAAAA,GAAG,CAACS,SAAJ,GAAgBI,IAAI,CAACC,KAAL,CAAWN,KAAK,GAAGD,QAAnB,CAAhB;AACD;;AAEDP,MAAAA,GAAG,CAACe,kBAAJ,GAAyBb,iBAAzB;AACAF,MAAAA,GAAG,CAACgB,gBAAJ,GAAuB7C,eAAvB;AACA6B,MAAAA,GAAG,CAACU,gBAAJ,GAAuB,IAAvB;AACD;;AAED,WAAOV,GAAP;AACD,GA3CI,EA4CL;AACES,IAAAA,SAAS,EAAE,CADb;AAEEM,IAAAA,kBAAkB,EAAE,IAFtB;AAGE;AACAC,IAAAA,gBAAgB,EAAE,2BAAUlD,cAAV,EAA0BmD,GAA1B,CAA8B,UAAC7C,MAAD;AAAA,6CAAkBA,MAAlB;AAA0BI,QAAAA,WAAW,EAAE;AAAvC;AAAA,KAA9B,CAJpB;AAKEkC,IAAAA,gBAAgB,EAAE;AALpB,GA5CK,CAAP;AAoDD,CAnFM;;;;AAqFA,IAAMQ,SAAS,GAAG,SAAZA,SAAY,CAAChC,QAAD;AAAA,yCAAoBiC,oBAApB,GAAiCjC,QAAjC;AAAA,CAAlB;;;;AAEA,SAASkC,KAAT,CAAelC,QAAf,EAAyBC,OAAzB,EAAkCN,GAAlC,EAAuC;AAC5C,SAAO,IAAIwC,OAAJ,CAAY,UAACC,OAAD,EAAa;AAC9B,QAAMC,kBAAkB,GAAGL,SAAS,CAAChC,QAAD,CAApC;;AACA,gBACEqC,kBAAkB,IAAI,EADxB;AAAA,QAAQC,WAAR,SAAQA,WAAR;AAAA,QAAqBC,MAArB,SAAqBA,MAArB;AAAA,QAA6BC,aAA7B,SAA6BA,aAA7B;AAAA,QAA4CC,KAA5C,SAA4CA,KAA5C;AAAA,QAAmDvC,OAAnD,SAAmDA,OAAnD;AAAA,QAA4DwC,YAA5D,SAA4DA,YAA5D;AAAA,QAA6EC,aAA7E;;AAEA,QAAMC,MAAN,GAAiBP,kBAAjB,CAAMO,MAAN;;AACA,gBAAuBjD,GAAG,IAAI,EAA9B;AAAA,QAAQkD,IAAR,SAAQA,IAAR;AAAA,QAAcC,IAAd,SAAcA,IAAd,CAL8B,CAO9B;AACA;;;AACA,QAAI,OAAOF,MAAP,KAAkB,SAAtB,EAAiC;AAC/B,UAAIA,MAAJ,EAAY;AACVA,QAAAA,MAAM,GAAG;AACPG,UAAAA,IAAI,EAAE,IADC;AAEPC,UAAAA,KAAK,EAAE,IAFA;AAGPC,UAAAA,EAAE,EAAE,IAHG;AAIPC,UAAAA,IAAI,EAAE;AAJC,SAAT;AAMD,OAPD,MAOO;AACLN,QAAAA,MAAM,GAAG;AACPG,UAAAA,IAAI,EAAE,KADC;AAEPC,UAAAA,KAAK,EAAE,KAFA;AAGPC,UAAAA,EAAE,EAAE,KAHG;AAIPC,UAAAA,IAAI,EAAE;AAJC,SAAT;AAMD;AACF,KAzB6B,CA2B9B;;;AACA,QAAMC,mBAAmB,GAAG,CAACT,YAAY,IAAI,EAAjB,EAAqBjC,MAArB,CAA4B,UAAC2C,IAAD;AAAA,aAAUA,IAAI,KAAK,OAAnB;AAAA,KAA5B,CAA5B;AACA,QAAMC,qBAAqB,GAAGf,WAAW,IAAKa,mBAAmB,CAACjC,MAApB,IAA8BiC,mBAAmB,CAAC,CAAD,CAAjE,IAAyE,EAAvG;;AAEA,QAAMG,IAAI,mCACLX,aADK;AAERzC,MAAAA,OAAO,EAAPA,OAFQ;AAGR0C,MAAAA,MAAM,EAANA,MAHQ;AAIRN,MAAAA,WAAW,EAAEe,qBAJL;AAKRE,MAAAA,QAAQ,EAAE5D,GAAG,CAACkD,IAAJ,KAAa,QALf;AAMRN,MAAAA,MAAM,EAAEC,aAAa,GAAGD,MAAH,GAAY,IANzB;AAORiB,MAAAA,SAAS,EAAE,IAPH;AAQRC,MAAAA,IAAI,EAAEhB,KARE;AASRiB,MAAAA,UAAU,EACR/D,GAAG,CAACkD,IAAJ,KAAa,UAAb,IACA,CAAC,yBAAQ3C,OAAR,CADD,IAEAA,OAAO,CAACS,aAFR,IAGAT,OAAO,CAACS,aAAR,CAAsB7B,KAHtB,IAIA,CAAC,yBAAQoB,OAAO,CAACS,aAAR,CAAsB7B,KAA9B,CAdK;AAeR6E,MAAAA,mBAAmB,EAAE,IAfb;AAgBRjB,MAAAA,YAAY,EAAZA;AAhBQ,MAAV;;AAmBA,QAAII,IAAI,KAAK,YAAT,KAA0BD,IAAI,KAAK,MAAT,IAAmBA,IAAI,KAAK,UAAtD,CAAJ,EAAuE;AACrE,kBAAyFR,kBAAkB,IAAI,EAA/G;AAAA,UAAQmB,SAAR,SAAQA,SAAR;AAAA,UAAmBI,gBAAnB,SAAmBA,gBAAnB;AAAA,UAAqCD,mBAArC,SAAqCA,mBAArC;AAAA,UAA0DE,0BAA1D,SAA0DA,0BAA1D;;AAEAP,MAAAA,IAAI,CAACE,SAAL,GAAiBI,gBAAgB,GAAGJ,SAAH,GAAe,IAAhD;AACAF,MAAAA,IAAI,CAACK,mBAAL,GAA2BE,0BAA0B,GAAGF,mBAAH,GAAyB,IAA9E;AACD;;AAED,QAAId,IAAI,KAAK,UAAb,EAAyB;AACvB,UACE,CAAC,yBAAQ3C,OAAR,CAAD,IACAA,OAAO,CAACS,aADR,IAEAT,OAAO,CAACS,aAAR,CAAsB7B,KAFtB,IAGA,CAAC,yBAAQoB,OAAO,CAACS,aAAR,CAAsB7B,KAA9B,CAJH,EAKE;AACA,6BAA4DiB,aAAa,CAACsC,kBAAD,EAAqBpC,OAArB,EAA8BN,GAA9B,CAAzE;AAAA,YAAQmC,gBAAR,kBAAQA,gBAAR;AAAA,YAA0BD,kBAA1B,kBAA0BA,kBAA1B;AAAA,YAA8CN,SAA9C,kBAA8CA,SAA9C,CADA,CAEA;;;AACA+B,QAAAA,IAAI,CAACxB,gBAAL,GAAwBA,gBAAxB;AACAwB,QAAAA,IAAI,CAACQ,eAAL,GAAuBjC,kBAAkB,GAAG,CAAC3B,OAAO,CAAC2B,kBAAD,CAAP,IAA+B,EAAhC,EAAoC/C,KAAvC,GAA+C,EAAxF;AACAwE,QAAAA,IAAI,CAACI,UAAL,GAAkBJ,IAAI,CAACI,UAAL,IAAmBnC,SAAS,KAAK,CAAnD;AACD,OAXD,MAWO;AACL+B,QAAAA,IAAI,CAACxB,gBAAL,GAAyB7B,OAAO,IAAIA,OAAO,CAACf,MAApB,IAA+B,EAAvD;AACAoE,QAAAA,IAAI,CAACQ,eAAL,GAAuB,EAAvB;AACD;AACF;;AAEDnG,IAAAA,GAAG,CAAC,QAAD,EAAW2F,IAAX,CAAH;AACAlB,IAAAA,OAAO,CAACkB,IAAD,CAAP;AACD,GA7EM,CAAP;AA8ED;;AAEM,SAASS,OAAT,CAAiB/D,QAAjB,EAA2BC,OAA3B,EAA8C;AAAA,MAAVN,GAAU,uEAAJ,EAAI;AACnD,SAAO,IAAIwC,OAAJ,CAAY,UAACC,OAAD,EAAa;AAC9B,QAAI,CAACnC,OAAD,IAAY,yBAAQA,OAAR,CAAhB,EAAkC;AAChCmC,MAAAA,OAAO,CAAC;AAAEd,QAAAA,KAAK,EAAE,CAAT;AAAY0C,QAAAA,KAAK,EAAE;AAAnB,OAAD,CAAP;AACD;;AAED,QACErE,GAAG,CAACkD,IAAJ,KAAa,UAAb,IACA,yBAAQ7C,QAAQ,CAACE,OAAjB,CADA,IAECF,QAAQ,CAACE,OAAT,IAAoBF,QAAQ,CAACE,OAAT,CAAiBS,aAArC,IAAsD,yBAAQX,QAAQ,CAACE,OAAT,CAAiBS,aAAjB,CAA+B7B,KAAvC,CAHzD,EAIE;AACAsD,MAAAA,OAAO,CAAC;AAAEd,QAAAA,KAAK,EAAE;AAAT,OAAD,CAAP;AACD;;AAED,0BAAsBvB,aAAa,CAACC,QAAD,EAAWC,OAAX,EAAoBN,GAApB,CAAnC;AAAA,QAAQ4B,SAAR,mBAAQA,SAAR;;AAEAa,IAAAA,OAAO,CAAC;AAAEd,MAAAA,KAAK,EAAEC;AAAT,KAAD,CAAP;AACD,GAhBM,CAAP;AAiBD;;AAEM,IAAM0C,4BAA4B,GAAG,SAA/BA,4BAA+B,CAACjE,QAAD,EAAWL,GAAX,EAAmB;AAC7D,SAAO,IAAIwC,OAAJ,CAAY,UAACC,OAAD,EAAa;AAC9B,QAAIzC,GAAG,CAACkD,IAAJ,KAAa,UAAb,IAA2BlD,GAAG,CAACmD,IAAJ,KAAa,YAA5C,EAA0D;AACxD,mBAAoB9C,QAAQ,IAAI,EAAhC;AAAA,UAAQE,OAAR,UAAQA,OAAR;;AACA,UAAIpB,KAAK,GAAG,EAAZ;;AAEA,UAAIoB,OAAO,IAAIE,MAAM,CAAC8D,MAAP,CAAchE,OAAd,CAAf,EAAuC;AACrC,YAAMS,aAAa,GAAGT,OAAO,CAACS,aAAR,IAAyBP,MAAM,CAAC8D,MAAP,CAAchE,OAAd,EAAuB,CAAvB,CAAzB,IAAsD,EAA5E;AACApB,QAAAA,KAAK,GAAG6B,aAAa,CAAC7B,KAAd,IAAuB,EAA/B;AACD;;AAEDsD,MAAAA,OAAO,CAAC;AACNlD,QAAAA,MAAM,EAAEJ,KADF;AAENqF,QAAAA,EAAE,EAAE;AAFE,OAAD,CAAP;AAID,KAbD,MAaO;AACL/B,MAAAA,OAAO,CAAC,IAAD,CAAP;AACD;AACF,GAjBM,CAAP;AAkBD,CAnBM;;;;AAqBA,IAAMgC,QAAQ,GAAG,SAAXA,QAAW,GAAgB;AAAA,MAAflC,KAAe,uEAAP,EAAO;AACtC,MAAQhC,OAAR,GAAkCgC,KAAlC,CAAQhC,OAAR;AAAA,MAAiBwC,YAAjB,GAAkCR,KAAlC,CAAiBQ,YAAjB;AACA,MAAM2B,MAAM,GAAG,EAAf;AACA,MAAMC,mBAAmB,GAAG,EAA5B;AACA,MAAMnB,mBAAmB,GAAG,CAACT,YAAY,IAAI,EAAjB,EAAqBjC,MAArB,CAA4B,UAAC2C,IAAD;AAAA,WAAUA,IAAI,KAAK,OAAnB;AAAA,GAA5B,CAA5B;;AAEA,MAAI,CAACD,mBAAmB,CAACjC,MAAzB,EAAiC;AAC/BmD,IAAAA,MAAM,CAACE,iBAAP,GAA2B,0CAA3B;AACD;;AAEDnE,EAAAA,MAAM,CAACC,OAAP,CAAeH,OAAO,IAAI,EAA1B,EAA8BI,OAA9B,CAAsC,kBAAkB;AAAA;AAAA,QAAhBC,GAAgB;AAAA,QAAXC,KAAW;;AACtD,QAAI,CAACA,KAAK,CAAC1B,KAAN,CAAYoC,MAAjB,EAAyB;AACvBoD,MAAAA,mBAAmB,CAAC/D,GAAD,CAAnB,GAA2B,4CAA3B;AACD;AACF,GAJD;;AAMA,MAAI,CAAC,yBAAQ+D,mBAAR,CAAL,EAAmC;AACjCD,IAAAA,MAAM,CAACC,mBAAP,GAA6BA,mBAA7B;AACD;;AAED,SAAOD,MAAP;AACD,CArBM","sourcesContent":["import debug from 'debug';\n\nimport cloneDeep from 'lodash/cloneDeep';\nimport uniqWith from 'lodash/uniqWith';\nimport isEmpty from 'lodash/isEmpty';\nimport defaults from './defaults';\nimport { equalMarks, sortedAnswers } from './utils';\n\nimport { partialScoring } from '@pie-lib/controller-utils';\n\nconst log = debug('@pie-element:graphing:controller');\n\nconst initializeGraphMap = () => ({\n  point: [],\n  segment: [],\n  line: [],\n  ray: [],\n  vector: [],\n  polygon: [],\n  circle: [],\n  sine: [],\n  parabola: [],\n});\n\nexport const compareMarks = (mark1, mark2) => {\n  // marks can be compared with equalMarks[type] function only if they have the same type;\n  // if type is different, they are clearly not equal\n  return !!(\n    mark1 &&\n    mark2 &&\n    mark1.type === mark2.type &&\n    equalMarks[mark1.type] &&\n    equalMarks[mark1.type](mark1, mark2)\n  );\n};\n\nexport const getAnswerCorrected = ({ sessionAnswers, marks: correctAnswers }) => {\n  sessionAnswers = sessionAnswers || [];\n  correctAnswers = correctAnswers || [];\n\n  const rez = cloneDeep(sessionAnswers).reduce((correctedAnswer, answer) => {\n    const answerIsCorrect = correctAnswers.find((mark) => compareMarks(answer, mark));\n\n    answer.correctness = answerIsCorrect ? 'correct' : 'incorrect';\n\n    return [...correctedAnswer, answer];\n  }, []);\n\n  // add missing objects from correct answer\n  const missingAnswers = cloneDeep(correctAnswers).reduce((correctedAnswer, answer) => {\n    const answerIndex = sessionAnswers.find((mark) => compareMarks(answer, mark));\n\n    if (!answerIndex) {\n      // means that corrected answer is missing from session, so we mark it as missing object\n      return [...correctedAnswer, { ...answer, correctness: 'missing' }];\n    }\n\n    return correctedAnswer;\n  }, []);\n\n  return [...rez, ...missingAnswers];\n};\n\nconst getPartialScoring = ({ scoringType, env }) => {\n  let pS = scoringType;\n\n  // if scoringType is undefined, partialScoring should be considered undefined (not set)\n  // because partialScoring.enabled is using that information\n  // if it has a value, we check if it is partial scoring or dichotomous\n  if (scoringType) {\n    pS = scoringType === 'partial scoring';\n  }\n\n  return partialScoring.enabled({ partialScoring: pS }, env);\n};\n\nexport const getBestAnswer = (question, session, env = {}) => {\n  // questionPossibleAnswers contains all possible answers (correct response and alternates);\n  let { answers: questionPossibleAnswers = {}, scoringType } = question || {};\n  let { answer } = session || {};\n\n  // filter the incomplete objects\n  Object.entries(questionPossibleAnswers || {}).forEach(\n    ([key, value]) =>\n      (questionPossibleAnswers[key] = { ...value, marks: value?.marks.filter((mark) => !mark.building) }),\n  );\n\n  // initialize answer if no values\n  answer = answer || [];\n\n  // initialize one possible answer if no values\n  if (isEmpty(questionPossibleAnswers)) {\n    questionPossibleAnswers = { correctAnswer: initializeGraphMap() };\n  } else {\n    questionPossibleAnswers = {\n      correctAnswer: questionPossibleAnswers.correctAnswer,\n      ...sortedAnswers(questionPossibleAnswers),\n    };\n  }\n\n  const partialScoringEnabled = getPartialScoring({ scoringType, env });\n\n  // student's answers without DUPLICATES\n  const sessionAnswers = uniqWith(answer, compareMarks);\n  // array of possible answers entries\n  const possibleAnswers = Object.entries(questionPossibleAnswers);\n\n  return possibleAnswers.reduce(\n    (acc, entry) => {\n      // iterating each possible answer (main + alternates)\n      const possibleAnswerKey = entry[0];\n      const possibleAnswer = entry[1] || {};\n      let { marks } = possibleAnswer;\n\n      if (!marks || !marks.length) {\n        return acc;\n      }\n\n      // returns array of marks, each having 'correctness' property\n      const correctedAnswer = getAnswerCorrected({ sessionAnswers, marks });\n      const correctMarks = correctedAnswer.filter((answer) => answer.correctness === 'correct');\n      // filter out missing objects because they do not affect the calculation of the score\n      // only correct and incorrect are needed\n      const scoredCorrectedAnswer = correctedAnswer.filter((answer) => answer.correctness !== 'missing');\n\n      const maxScore = marks.length;\n      let score = correctMarks.length;\n\n      // if extra placements\n      if (scoredCorrectedAnswer.length > maxScore) {\n        score -= scoredCorrectedAnswer.length - maxScore;\n      }\n\n      if (score < 0) {\n        score = 0;\n      }\n\n      if (score / maxScore > acc.bestScore || !acc.foundOneSolution) {\n        if (partialScoringEnabled) {\n          acc.bestScore = parseFloat((score / maxScore).toFixed(2));\n        } else {\n          acc.bestScore = Math.floor(score / maxScore);\n        }\n\n        acc.bestScoreAnswerKey = possibleAnswerKey;\n        acc.answersCorrected = correctedAnswer;\n        acc.foundOneSolution = true;\n      }\n\n      return acc;\n    },\n    {\n      bestScore: 0,\n      bestScoreAnswerKey: null,\n      // initially we just suppose all the answers are incorrect\n      answersCorrected: cloneDeep(sessionAnswers).map((answer) => ({ ...answer, correctness: 'incorrect' })),\n      foundOneSolution: false,\n    },\n  );\n};\n\nexport const normalize = (question) => ({ ...defaults, ...question });\n\nexport function model(question, session, env) {\n  return new Promise((resolve) => {\n    const normalizedQuestion = normalize(question);\n    const { defaultTool, prompt, promptEnabled, graph, answers, toolbarTools, ...questionProps } =\n      normalizedQuestion || {};\n    let { arrows } = normalizedQuestion;\n    const { mode, role } = env || {};\n\n    // This is used for offering support for old models which have the property arrows: boolean\n    // Same thing is set in authoring : packages/graphing/configure/src/configure.jsx - componentDidMount\n    if (typeof arrows === 'boolean') {\n      if (arrows) {\n        arrows = {\n          left: true,\n          right: true,\n          up: true,\n          down: true,\n        };\n      } else {\n        arrows = {\n          left: false,\n          right: false,\n          up: false,\n          down: false,\n        };\n      }\n    }\n\n    // added support for models without defaultTool defined; also used in packages/graphing/configure/src/index.js\n    const toolbarToolsNoLabel = (toolbarTools || []).filter((tool) => tool !== 'label');\n    const normalizedDefaultTool = defaultTool || (toolbarToolsNoLabel.length && toolbarToolsNoLabel[0]) || '';\n\n    const base = {\n      ...questionProps,\n      answers,\n      arrows,\n      defaultTool: normalizedDefaultTool,\n      disabled: env.mode !== 'gather',\n      prompt: promptEnabled ? prompt : null,\n      rationale: null,\n      size: graph,\n      showToggle:\n        env.mode === 'evaluate' &&\n        !isEmpty(answers) &&\n        answers.correctAnswer &&\n        answers.correctAnswer.marks &&\n        !isEmpty(answers.correctAnswer.marks),\n      teacherInstructions: null,\n      toolbarTools,\n    };\n\n    if (role === 'instructor' && (mode === 'view' || mode === 'evaluate')) {\n      const { rationale, rationaleEnabled, teacherInstructions, teacherInstructionsEnabled } = normalizedQuestion || {};\n\n      base.rationale = rationaleEnabled ? rationale : null;\n      base.teacherInstructions = teacherInstructionsEnabled ? teacherInstructions : null;\n    }\n\n    if (mode === 'evaluate') {\n      if (\n        !isEmpty(answers) &&\n        answers.correctAnswer &&\n        answers.correctAnswer.marks &&\n        !isEmpty(answers.correctAnswer.marks)\n      ) {\n        const { answersCorrected, bestScoreAnswerKey, bestScore } = getBestAnswer(normalizedQuestion, session, env);\n        // array of marks from session with 'correctness' property set\n        base.answersCorrected = answersCorrected;\n        base.correctResponse = bestScoreAnswerKey ? (answers[bestScoreAnswerKey] || {}).marks : [];\n        base.showToggle = base.showToggle && bestScore !== 1;\n      } else {\n        base.answersCorrected = (session && session.answer) || [];\n        base.correctResponse = [];\n      }\n    }\n\n    log('base: ', base);\n    resolve(base);\n  });\n}\n\nexport function outcome(question, session, env = {}) {\n  return new Promise((resolve) => {\n    if (!session || isEmpty(session)) {\n      resolve({ score: 0, empty: true });\n    }\n\n    if (\n      env.mode !== 'evaluate' ||\n      isEmpty(question.answers) ||\n      (question.answers && question.answers.correctAnswer && isEmpty(question.answers.correctAnswer.marks))\n    ) {\n      resolve({ score: 0 });\n    }\n\n    const { bestScore } = getBestAnswer(question, session, env);\n\n    resolve({ score: bestScore });\n  });\n}\n\nexport const createCorrectResponseSession = (question, env) => {\n  return new Promise((resolve) => {\n    if (env.mode !== 'evaluate' && env.role === 'instructor') {\n      const { answers } = question || {};\n      let marks = [];\n\n      if (answers && Object.values(answers)) {\n        const correctAnswer = answers.correctAnswer || Object.values(answers)[0] || {};\n        marks = correctAnswer.marks || [];\n      }\n\n      resolve({\n        answer: marks,\n        id: '1',\n      });\n    } else {\n      resolve(null);\n    }\n  });\n};\n\nexport const validate = (model = {}) => {\n  const { answers, toolbarTools } = model;\n  const errors = {};\n  const correctAnswerErrors = {};\n  const toolbarToolsNoLabel = (toolbarTools || []).filter((tool) => tool !== 'label');\n\n  if (!toolbarToolsNoLabel.length) {\n    errors.toolbarToolsError = 'There should be at least 1 tool defined.';\n  }\n\n  Object.entries(answers || {}).forEach(([key, value]) => {\n    if (!value.marks.length) {\n      correctAnswerErrors[key] = 'At least 1 graph object should be defined.';\n    }\n  });\n\n  if (!isEmpty(correctAnswerErrors)) {\n    errors.correctAnswerErrors = correctAnswerErrors;\n  }\n\n  return errors;\n};\n"],"file":"index.js"}

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "4.13.4-next.75+db9db09b3",
+  "version": "4.13.4-next.81+ad5aa357c",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -24,7 +24,7 @@
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "db9db09b3acc5226823d9abc70e8e1f856fbca7e",
+  "gitHead": "ad5aa357c165646deafc2675b78f44cef205fe3b",
   "main": "lib/index.js",
   "module": "src/index.js"
 }