@pie-element/math-templated 2.12.1 → 2.14.0

package/module/controller.js

@@ -3250,8 +3250,8 @@ function transformOptions(options) {
   return options;
 }
 
-function ownKeys$7(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$7(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys$7(Object(source), !0).forEach(function (key) { _defineProperty__default["default"](target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys$7(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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) { _defineProperty__default["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; }
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf__default["default"](Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf__default["default"](this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn__default["default"](this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function noop() {}
@@ -3311,9 +3311,9 @@ var I18n = function (_EventEmitter) {
         }
       }
       var defOpts = get$1();
-      this.options = _objectSpread$7(_objectSpread$7(_objectSpread$7({}, defOpts), this.options), transformOptions(options));
+      this.options = _objectSpread(_objectSpread(_objectSpread({}, defOpts), this.options), transformOptions(options));
       if (this.options.compatibilityAPI !== 'v1') {
-        this.options.interpolation = _objectSpread$7(_objectSpread$7({}, defOpts.interpolation), this.options.interpolation);
+        this.options.interpolation = _objectSpread(_objectSpread({}, defOpts.interpolation), this.options.interpolation);
       }
       if (options.keySeparator !== undefined) {
         this.options.userDefinedKeySeparator = options.keySeparator;
@@ -3591,7 +3591,7 @@ var I18n = function (_EventEmitter) {
           }
           options = _this5.options.overloadTranslationOptionHandler([key, opts].concat(rest));
         } else {
-          options = _objectSpread$7({}, opts);
+          options = _objectSpread({}, opts);
         }
         options.lng = options.lng || fixedT.lng;
         options.lngs = options.lngs || fixedT.lngs;
@@ -3718,7 +3718,7 @@ var I18n = function (_EventEmitter) {
       var _this8 = this;
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var callback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : noop;
-      var mergedOptions = _objectSpread$7(_objectSpread$7(_objectSpread$7({}, this.options), options), {
+      var mergedOptions = _objectSpread(_objectSpread(_objectSpread({}, this.options), options), {
         isClone: true
       });
       var clone = new I18n(mergedOptions);
@@ -3729,7 +3729,7 @@ var I18n = function (_EventEmitter) {
       membersToCopy.forEach(function (m) {
         clone[m] = _this8[m];
       });
-      clone.services = _objectSpread$7({}, this.services);
+      clone.services = _objectSpread({}, this.services);
       clone.services.utils = {
         hasLoadedNamespace: clone.hasLoadedNamespace.bind(clone)
       };
@@ -4041,185 +4041,6 @@ exports["default"] = _default;
 
 var Translator = /*@__PURE__*/getDefaultExportFromCjs(translator$2);
 
-var feedback$1 = {};
-
-var feedback = {};
-
-var _interopRequireDefault$2 = interopRequireDefault.exports;
-
-Object.defineProperty(feedback, "__esModule", {
-  value: true
-});
-feedback.getFeedbackForCorrectness = feedback.getFeedback = feedback.getActualFeedbackForCorrectness = feedback.getActualFeedback = feedback.defaults = void 0;
-
-var _defineProperty2 = _interopRequireDefault$2(defineProperty$1.exports);
-
-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 defaults$1 = {
-  correct: {
-    type: 'default',
-    "default": 'Correct',
-    custom: 'Correct'
-  },
-  incorrect: {
-    type: 'default',
-    "default": 'Incorrect',
-    custom: 'Incorrect'
-  },
-  partial: {
-    type: 'default',
-    "default": 'Nearly',
-    custom: 'Nearly'
-  },
-  unanswered: {
-    type: 'default',
-    "default": 'You have not entered a response',
-    custom: 'You have not entered a response'
-  }
-};
-/**
- * @typedef {Object} FeedbackConfig
- * @property {'default'|'none'|'custom'} type
- * @property {string} default
- * @property {string} custom
- *
- * @typedef {Object} Feedback
- *  @property {FeedbackConfig} correct
- *  @property {FeedbackConfig} incorrect
- *  @property {FeedbackConfig} partial
- */
-
-feedback.defaults = defaults$1;
-
-var normalizeCorrectness = function normalizeCorrectness(c) {
-  if (c === 'partially-correct') {
-    return 'partial';
-  }
-
-  return c;
-};
-/**
- * Get the feedback for the correctness
- *
- * @param {'correct'|'incorrect'|'partial'} correctness
- * @param {Feedback} feedback
- */
-
-
-var getFeedbackForCorrectness = function getFeedbackForCorrectness(correctness, feedback) {
-  return new Promise(function (resolve) {
-    feedback = _objectSpread(_objectSpread({}, defaults$1), feedback);
-    correctness = normalizeCorrectness(correctness);
-    var fb = feedback[correctness] || defaults$1[correctness] || {};
-    var d = defaults$1[correctness] || {};
-    getFeedback(fb, d[fb.type || 'default']).then(function (result) {
-      return resolve(result);
-    });
-  });
-};
-/**
- * Get the feedback from a {FeedbackConfig}
- *
- * @param {FeedbackConfig} feedback
- * @param {string} fallback
- */
-
-
-feedback.getFeedbackForCorrectness = getFeedbackForCorrectness;
-
-var getFeedback = function getFeedback(feedback, fallback) {
-  return new Promise(function (resolve) {
-    if (!feedback || feedback.type === 'none') {
-      resolve(undefined);
-      return;
-    }
-
-    feedback = feedback || {};
-    var out = feedback[feedback.type] || fallback;
-    resolve(out);
-  });
-}; // TODO: should replace getFeedbackForCorrectness
-
-/**
- * Get feedback for correctness
- * @param {'correct'|'incorrect'|'partial'} correctness
- * @param {Feedback} feedback
- */
-
-
-feedback.getFeedback = getFeedback;
-
-var getActualFeedbackForCorrectness = function getActualFeedbackForCorrectness(correctness, feedback) {
-  feedback = _objectSpread(_objectSpread({}, defaults$1), feedback); // normalize correctness
-
-  correctness = correctness === 'partially-correct' ? 'partial' : correctness;
-  var defaultFeedback = defaults$1[correctness] || {};
-  var fb = feedback[correctness] || defaultFeedback;
-  return getActualFeedback(fb, defaultFeedback[fb.type || 'default']);
-}; // TODO: should replace getFeedback
-
-/**
- * Get the feedback from a {FeedbackConfig}
- * @param {FeedbackConfig} feedback
- * @param {string} fallback
- */
-
-
-feedback.getActualFeedbackForCorrectness = getActualFeedbackForCorrectness;
-
-var getActualFeedback = function getActualFeedback(feedback, fallback) {
-  if (!feedback || feedback.type === 'none') {
-    return undefined;
-  }
-
-  return feedback[feedback.type] || fallback;
-};
-
-feedback.getActualFeedback = getActualFeedback;
-
-(function (exports) {
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "defaults", {
-  enumerable: true,
-  get: function get() {
-    return _feedback.defaults;
-  }
-});
-Object.defineProperty(exports, "getActualFeedback", {
-  enumerable: true,
-  get: function get() {
-    return _feedback.getActualFeedback;
-  }
-});
-Object.defineProperty(exports, "getActualFeedbackForCorrectness", {
-  enumerable: true,
-  get: function get() {
-    return _feedback.getActualFeedbackForCorrectness;
-  }
-});
-Object.defineProperty(exports, "getFeedback", {
-  enumerable: true,
-  get: function get() {
-    return _feedback.getFeedback;
-  }
-});
-Object.defineProperty(exports, "getFeedbackForCorrectness", {
-  enumerable: true,
-  get: function get() {
-    return _feedback.getFeedbackForCorrectness;
-  }
-});
-
-var _feedback = feedback;
-
-}(feedback$1));
-
 // Should be exactly the same as configure/defaults.js
 var defaults = {
   model: {
@@ -22971,6 +22792,7 @@ var _controllerUtils = controllerUtils;
 }(controllerUtils$1));
 
 const { translator } = Translator;
+const getContent = (html) => (html || '').replace(/(<(?!img|iframe)([^>]+)>)/gi, '');
 
 const getIsAnswerCorrect = (correctResponse, answerItem) => {
   let answerCorrect = false;
@@ -23175,8 +22997,57 @@ const createCorrectResponseSession = (question, env) =>
   });
 
 const validate = (model = {}, config = {}) => {
+  const { responses, markup } = model;
+  const { maxResponseAreas } = config;
+  const responsesErrors = {};
   const errors = {};
 
+  ['teacherInstructions', 'prompt', 'rationale'].forEach((field) => {
+    if (config[field]?.required && !getContent(model[field])) {
+      errors[field] = 'This field is required.';
+    }
+  });
+
+  Object.entries(responses || {}).forEach(([key, response], index) => {
+    const { answer } = response;
+    const reversedAlternates = [...Object.entries(response.alternates || {})].reverse();
+    const alternatesErrors = {};
+    const responseError = {};
+
+    if (answer === '') {
+      responseError.answer = 'Content should not be empty.';
+    }
+
+    reversedAlternates.forEach(([key, value], index) => {
+      if (value === '') {
+        alternatesErrors[key] = 'Content should not be empty.';
+      } else {
+        const identicalAnswer =
+          answer === value || reversedAlternates.slice(index + 1).some(([, val]) => val === value);
+
+        if (identicalAnswer) {
+          alternatesErrors[key] = 'Content should be unique.';
+        }
+      }
+    });
+
+    if (!isEmpty_1(responseError) || !isEmpty_1(alternatesErrors)) {
+      responsesErrors[index] = { ...responseError, ...alternatesErrors };
+    }
+  });
+
+  const nbOfResponseAreas = (markup.match(/\{\{(\d+)\}\}/g) || []).length;
+
+  if (nbOfResponseAreas > maxResponseAreas) {
+    errors.responseAreas = `No more than ${maxResponseAreas} response areas should be defined.`;
+  } else if (nbOfResponseAreas < 1) {
+    errors.responseAreas = 'There should be at least 1 response area defined.';
+  }
+
+  if (!isEmpty_1(responsesErrors)) {
+    errors.responses = responsesErrors;
+  }
+
   return errors;
 };
 

package/module/element.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering_accessible, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.13.1/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering_accessible, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.14.0/module/index.js";
 import {_dll_pie_lib__pie_toolbox_math_input, _dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_correct_answer_toggle} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 function getDefaultExportFromCjs(x) {

package/module/index.html

@@ -2,7 +2,7 @@
   <!doctype html>
   <html>
     <head>
-      <title>@pie-element/math-templated@2.12.0</title>
+      <title>@pie-element/math-templated@2.13.0</title>
       <script
         type="module"
         src="https://cdn.jsdelivr.net/npm/@pslb/demo-el@^1.0.0/dist/demo-el/demo-el.esm.js"></script>

package/module/manifest.json

@@ -1,10 +1,10 @@
 {
   "name": "@pie-element/math-templated",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "modules": [
     {
       "name": "@pie-lib/pie-toolbox-math-rendering-module",
-      "version": "1.13.1"
+      "version": "1.14.0"
     },
     {
       "name": "@pie-lib/pie-toolbox-module",

package/module/print.html

@@ -2,7 +2,7 @@
   <!doctype html>
   <html>
     <head>
-      <title>@pie-element/math-templated@2.12.0</title>
+      <title>@pie-element/math-templated@2.13.0</title>
       <link
         href="https://fonts.googleapis.com/css?family=Roboto&display=swap"
         rel="stylesheet"

package/module/print.js

@@ -1,4 +1,4 @@
-import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering_accessible, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.13.1/module/index.js";
+import {_dll_react, _dll_prop_types, _dll_classnames, _dll_react_dom, _dll_debug, _dll_lodash, _dll_react_dom_server, _dll_pie_lib__pie_toolbox_math_rendering_accessible, _dll_pie_framework__mathquill} from "../../../@pie-lib/pie-toolbox-math-rendering-module@1.14.0/module/index.js";
 import {_dll_pie_lib__pie_toolbox_math_input, _dll_pie_lib__pie_toolbox_render_ui, _dll_pie_lib__pie_toolbox_correct_answer_toggle} from "../../../@pie-lib/pie-toolbox-module@4.12.0/module/index.js";
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 function getDefaultExportFromCjs(x) {

package/package.json

@@ -4,19 +4,19 @@
     "access": "public"
   },
   "repository": "pie-framework/pie-elements",
-  "version": "2.12.1",
+  "version": "2.14.0",
   "description": "",
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "1.21.0",
+    "@pie-lib/pie-toolbox": "1.21.1",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },
   "author": "",
   "license": "ISC",
-  "gitHead": "989d6e261d8d8edc4da64e0aa6b572bddbb87a0f",
+  "gitHead": "b2a26cca9c68cb159752b0d8b1325e474d4e1083",
   "scripts": {
     "postpublish": "../../scripts/postpublish"
   },