@pie-element/graphing-solution-set 6.2.2-beta.6 → 6.2.2-beta.7

package/controller/lib/utils.js

@@ -0,0 +1,212 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.sortedAnswers = exports.removeInvalidSegments = exports.removeInvalidAnswers = exports.removeDuplicateSegments = exports.equalSegment = exports.equalPolygon = exports.equalMarks = exports.equalLine = exports.constructSegmentsFromPoints = void 0;
+var _lodashEs = require("lodash-es");
+/*
+ * Constant to check equal segments
+ * @param {Object} segment1 - segment 1
+ * @param {Object} segment2 - segment 2
+ * */
+const equalSegment = (segment1, segment2) => {
+  // A.from = B.from, A.to = B.to OR A.from = B.to, A.to = B.from
+  // x1 = x3 & y1 = y3 & x2 = x4 & y2 = y4
+  return (0, _lodashEs.isEqual)(segment1.from, segment2.from) && (0, _lodashEs.isEqual)(segment1.to, segment2.to) || (0, _lodashEs.isEqual)(segment1.to, segment2.from) && (0, _lodashEs.isEqual)(segment1.from, segment2.to);
+};
+
+// this function is implemented in configure as well
+/*
+ * Constant to get sorted answers
+ * @param {Object} answers - answers
+ * */
+exports.equalSegment = equalSegment;
+const sortedAnswers = answers => Object.keys(answers || {}).sort().reduce((result, key) => {
+  if (key !== 'correctAnswer') {
+    result[key] = answers[key];
+  }
+  return result;
+}, {});
+
+/*
+ * Constant to return line equation coefficients
+ * @param {Object} line - line
+ * */
+exports.sortedAnswers = sortedAnswers;
+const returnLineEquationCoefficients = line => {
+  line = {
+    ...line,
+    to: {
+      ...line.to
+    },
+    from: {
+      ...line.from
+    }
+  };
+  const xA = line.from.x;
+  const yA = line.from.y;
+  const xB = line.to.x;
+  const yB = line.to.y;
+  return {
+    a: yB - yA,
+    b: xA - xB,
+    c: xB * yA - xA * yB
+  };
+};
+
+/*
+ * Constant to get significant decimals
+ * @param {Number} number - number
+ * */
+const getSignificantDecimals = number => Math.round(number * 10000) / 10000;
+
+/*
+ * Constant to check equal lines
+ * @param {Object} line1 - line 1
+ * @param {Object} line2 - line 2
+ * */
+const equalLine = (line1, line2) => {
+  // line equation: ax + by + c = 0
+  // 2 lines are equal if a1/a2 = b1/b2 = c1/c2, where a, b, c are the coefficients in line equation
+  // line equation knowing 2 points: (y - yA) / (yB - yA) = (x - xA) / (xB - xA)
+  // extending this equation, we get: x * (yB - yA) + y * (xA - xB) + (xB * yA - xA * yB) = 0
+  // where a = yB - yA; b = xA - xB; c = xB * yA - xA * yB
+  const {
+    a: a1,
+    b: b1,
+    c: c1
+  } = returnLineEquationCoefficients(line1);
+  const {
+    a: a2,
+    b: b2,
+    c: c2
+  } = returnLineEquationCoefficients(line2);
+  const proportions = [];
+  if (a2 !== 0) {
+    proportions.push(getSignificantDecimals(a1 / a2));
+  } else if (a1 !== a2) {
+    return false;
+  }
+  if (b2 !== 0) {
+    proportions.push(getSignificantDecimals(b1 / b2));
+  } else if (b1 !== b2) {
+    return false;
+  }
+  if (c2 !== 0) {
+    proportions.push(getSignificantDecimals(c1 / c2));
+  } else if (c1 !== c2) {
+    return false;
+  }
+  return (0, _lodashEs.uniq)(proportions).length === 1 && line1.fill === line2.fill;
+  // (y2 - y1)/(x2 - x1) = (y4 - y3)/(x4 - x3);
+  // return ((Math.abs((line1.to.y - line1.from.y) / (line1.to.x - line1.from.x))) === (Math.abs((line2.to.y - line2.from.y) / (line2.to.x - line2.from.x))));
+};
+
+/*
+ * Constant to construct segments from points
+ * @param {Array} points - points
+ * */
+exports.equalLine = equalLine;
+const constructSegmentsFromPoints = points => {
+  // takes the list of points that represent a polygon and transforms it into a list of segments; eg.:
+  // points: A, B, C, D => segments: AB, BC, CD, DA
+  return (points || []).map((point, index) => ({
+    from: point,
+    to: points[(index + 1) % points.length]
+  }));
+};
+
+/*
+ * Constant to remove duplicate segments
+ * @param {Array} segments - segments
+ * */
+exports.constructSegmentsFromPoints = constructSegmentsFromPoints;
+const removeDuplicateSegments = segments => {
+  segments = segments || [];
+  // removes segments that are duplicates; eg. These segments are the same, so one will be removed:
+  // segment1: from: { x: 1, y: 1 }, to: { x: 2, y: 1 }
+  // segment2: from: { x: 2, y: 1 }, to: { x: 1, y: 1 }
+  return (0, _lodashEs.uniqWith)(segments, (s1, s2) => equalSegment(s1, s2));
+};
+
+/*
+ * Constant to remove invalid segments
+ * @param {Array} segments - segments
+ * */
+exports.removeDuplicateSegments = removeDuplicateSegments;
+const removeInvalidSegments = segments => {
+  segments = segments || [];
+  // removes segments that start in a point and end in the same point (eg.: from: { x: 1, y: 1 }, to: { x: 1, y: 1 })
+  return segments.filter(segment => !(0, _lodashEs.isEqual)(segment.from, segment.to));
+};
+
+/*
+ * Constant to check equal polygons
+ * @param {Object} poly1 - polygon 1 points
+ * @param {Object} poly2 - polygon 2 points
+ * */
+exports.removeInvalidSegments = removeInvalidSegments;
+const equalPolygon = (poly1, poly2) => {
+  const {
+    points: points1
+  } = poly1;
+  const {
+    points: points2
+  } = poly2;
+  // generate segments
+  const segments1 = constructSegmentsFromPoints(points1);
+  const segments2 = constructSegmentsFromPoints(points2);
+  const segments1NoDuplicates = removeDuplicateSegments(removeInvalidSegments(segments1));
+  const segments2NoDuplicates = removeDuplicateSegments(removeInvalidSegments(segments2));
+  const differentSegments1 = (0, _lodashEs.differenceWith)(segments1NoDuplicates, segments2NoDuplicates, equalSegment);
+  const differentSegments2 = (0, _lodashEs.differenceWith)(segments2NoDuplicates, segments1NoDuplicates, equalSegment);
+  return (!differentSegments1 || !differentSegments1.length) && (!differentSegments2 || !differentSegments2.length);
+};
+
+/*
+ * Constant to compare equal marks
+ * */
+exports.equalPolygon = equalPolygon;
+const equalMarks = exports.equalMarks = {
+  line: (sessAnswer, mark) => equalLine(sessAnswer, mark),
+  polygon: (sessAnswer, poly) => equalPolygon(sessAnswer, poly)
+};
+
+/*
+ * Check if a point is correct and complete
+ * @param {Object} point - point object
+ * */
+const completePoint = point => point && Number.isFinite(point.x) && Number.isFinite(point.y);
+
+/*
+ * Check if a line is complete
+ * @param {Object} item - mark object
+ * */
+const completeFromTo = item => item && completeMark.point(item.from) && completeMark.point(item.to);
+
+/*
+ * Check if a point is correct and complete
+ * @param {Object} item - mark object
+ * */
+const completePoints = item => item && item.points && item.points.length && (item.points.filter(point => completePoint(point)) || []).length === item.points.length;
+
+/*
+ * Complete mark object for line and point
+ * */
+const completeMark = {
+  point: completePoint,
+  line: completeFromTo,
+  polygon: completePoints
+};
+
+/*
+ * Function to remove invalid answers
+ * @param {Array} answers - answers array
+ * */
+const removeInvalidAnswers = answers => answers ? (answers || []).filter(({
+  type,
+  ...answer
+}) => completeMark[type] ? completeMark[type](answer) : false) : [];
+exports.removeInvalidAnswers = removeInvalidAnswers;
+//# sourceMappingURL=utils.js.map

package/controller/lib/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","names":["_lodashEs","require","equalSegment","segment1","segment2","isEqual","from","to","exports","sortedAnswers","answers","Object","keys","sort","reduce","result","key","returnLineEquationCoefficients","line","xA","x","yA","y","xB","yB","a","b","c","getSignificantDecimals","number","Math","round","equalLine","line1","line2","a1","b1","c1","a2","b2","c2","proportions","push","uniq","length","fill","constructSegmentsFromPoints","points","map","point","index","removeDuplicateSegments","segments","uniqWith","s1","s2","removeInvalidSegments","filter","segment","equalPolygon","poly1","poly2","points1","points2","segments1","segments2","segments1NoDuplicates","segments2NoDuplicates","differentSegments1","differenceWith","differentSegments2","equalMarks","sessAnswer","mark","polygon","poly","completePoint","Number","isFinite","completeFromTo","item","completeMark","completePoints","removeInvalidAnswers","type","answer"],"sources":["../src/utils.js"],"sourcesContent":["import { isEqual, differenceWith, uniq, uniqWith } from 'lodash-es';\n\n/*\n * Constant to check equal segments\n * @param {Object} segment1 - segment 1\n * @param {Object} segment2 - segment 2\n * */\nexport const equalSegment = (segment1, segment2) => {\n  // A.from = B.from, A.to = B.to OR A.from = B.to, A.to = B.from\n  // x1 = x3 & y1 = y3 & x2 = x4 & y2 = y4\n  return (\n    (isEqual(segment1.from, segment2.from) && isEqual(segment1.to, segment2.to)) ||\n    (isEqual(segment1.to, segment2.from) && isEqual(segment1.from, segment2.to))\n  );\n};\n\n// this function is implemented in configure as well\n/*\n * Constant to get sorted answers\n * @param {Object} answers - answers\n * */\nexport const sortedAnswers = (answers) =>\n  Object.keys(answers || {})\n    .sort()\n    .reduce((result, key) => {\n      if (key !== 'correctAnswer') {\n        result[key] = answers[key];\n      }\n      return result;\n    }, {});\n\n/*\n * Constant to return line equation coefficients\n * @param {Object} line - line\n * */\nconst returnLineEquationCoefficients = (line) => {\n  line = { ...line, to: { ...line.to }, from: { ...line.from } };\n  const xA = line.from.x;\n  const yA = line.from.y;\n  const xB = line.to.x;\n  const yB = line.to.y;\n  return {\n    a: yB - yA,\n    b: xA - xB,\n    c: xB * yA - xA * yB,\n  };\n};\n\n/*\n * Constant to get significant decimals\n * @param {Number} number - number\n * */\nconst getSignificantDecimals = (number) => Math.round(number * 10000) / 10000;\n\n/*\n * Constant to check equal lines\n * @param {Object} line1 - line 1\n * @param {Object} line2 - line 2\n * */\nexport const equalLine = (line1, line2) => {\n  // line equation: ax + by + c = 0\n  // 2 lines are equal if a1/a2 = b1/b2 = c1/c2, where a, b, c are the coefficients in line equation\n  // line equation knowing 2 points: (y - yA) / (yB - yA) = (x - xA) / (xB - xA)\n  // extending this equation, we get: x * (yB - yA) + y * (xA - xB) + (xB * yA - xA * yB) = 0\n  // where a = yB - yA; b = xA - xB; c = xB * yA - xA * yB\n  const { a: a1, b: b1, c: c1 } = returnLineEquationCoefficients(line1);\n  const { a: a2, b: b2, c: c2 } = returnLineEquationCoefficients(line2);\n  const proportions = [];\n  if (a2 !== 0) {\n    proportions.push(getSignificantDecimals(a1 / a2));\n  } else if (a1 !== a2) {\n    return false;\n  }\n  if (b2 !== 0) {\n    proportions.push(getSignificantDecimals(b1 / b2));\n  } else if (b1 !== b2) {\n    return false;\n  }\n  if (c2 !== 0) {\n    proportions.push(getSignificantDecimals(c1 / c2));\n  } else if (c1 !== c2) {\n    return false;\n  }\n  return uniq(proportions).length === 1 && line1.fill === line2.fill;\n  // (y2 - y1)/(x2 - x1) = (y4 - y3)/(x4 - x3);\n  // return ((Math.abs((line1.to.y - line1.from.y) / (line1.to.x - line1.from.x))) === (Math.abs((line2.to.y - line2.from.y) / (line2.to.x - line2.from.x))));\n};\n\n/*\n * Constant to construct segments from points\n * @param {Array} points - points\n * */\nexport const constructSegmentsFromPoints = (points) => {\n  // takes the list of points that represent a polygon and transforms it into a list of segments; eg.:\n  // points: A, B, C, D => segments: AB, BC, CD, DA\n  return (points || []).map((point, index) => ({ from: point, to: points[(index + 1) % points.length] }));\n};\n\n/*\n * Constant to remove duplicate segments\n * @param {Array} segments - segments\n * */\nexport const removeDuplicateSegments = (segments) => {\n  segments = segments || [];\n  // removes segments that are duplicates; eg. These segments are the same, so one will be removed:\n  // segment1: from: { x: 1, y: 1 }, to: { x: 2, y: 1 }\n  // segment2: from: { x: 2, y: 1 }, to: { x: 1, y: 1 }\n  return uniqWith(segments, (s1, s2) => equalSegment(s1, s2));\n};\n\n/*\n * Constant to remove invalid segments\n * @param {Array} segments - segments\n * */\nexport const removeInvalidSegments = (segments) => {\n  segments = segments || [];\n  // removes segments that start in a point and end in the same point (eg.: from: { x: 1, y: 1 }, to: { x: 1, y: 1 })\n  return segments.filter((segment) => !isEqual(segment.from, segment.to));\n};\n\n/*\n * Constant to check equal polygons\n * @param {Object} poly1 - polygon 1 points\n * @param {Object} poly2 - polygon 2 points\n * */\nexport const equalPolygon = (poly1, poly2) => {\n  const { points: points1 } = poly1;\n  const { points: points2 } = poly2;\n  // generate segments\n  const segments1 = constructSegmentsFromPoints(points1);\n  const segments2 = constructSegmentsFromPoints(points2);\n  const segments1NoDuplicates = removeDuplicateSegments(removeInvalidSegments(segments1));\n  const segments2NoDuplicates = removeDuplicateSegments(removeInvalidSegments(segments2));\n  const differentSegments1 = differenceWith(segments1NoDuplicates, segments2NoDuplicates, equalSegment);\n  const differentSegments2 = differenceWith(segments2NoDuplicates, segments1NoDuplicates, equalSegment);\n  return (!differentSegments1 || !differentSegments1.length) && (!differentSegments2 || !differentSegments2.length);\n};\n\n/*\n * Constant to compare equal marks\n * */\nexport const equalMarks = {\n  line: (sessAnswer, mark) => equalLine(sessAnswer, mark),\n  polygon: (sessAnswer, poly) => equalPolygon(sessAnswer, poly),\n};\n\n/*\n * Check if a point is correct and complete\n * @param {Object} point - point object\n * */\nconst completePoint = (point) => point && Number.isFinite(point.x) && Number.isFinite(point.y);\n\n/*\n * Check if a line is complete\n * @param {Object} item - mark object\n * */\nconst completeFromTo = (item) => item && completeMark.point(item.from) && completeMark.point(item.to);\n\n/*\n * Check if a point is correct and complete\n * @param {Object} item - mark object\n * */\nconst completePoints = (item) =>\n  item &&\n  item.points &&\n  item.points.length &&\n  (item.points.filter((point) => completePoint(point)) || []).length === item.points.length;\n\n/*\n * Complete mark object for line and point\n * */\nconst completeMark = {\n  point: completePoint,\n  line: completeFromTo,\n  polygon: completePoints,\n};\n\n/*\n * Function to remove invalid answers\n * @param {Array} answers - answers array\n * */\nexport const removeInvalidAnswers = (answers) =>\n  answers\n    ? (answers || []).filter(({ type, ...answer }) => (completeMark[type] ? completeMark[type](answer) : false))\n    : [];\n"],"mappings":";;;;;;AAAA,IAAAA,SAAA,GAAAC,OAAA;AAEA;AACA;AACA;AACA;AACA;AACO,MAAMC,YAAY,GAAGA,CAACC,QAAQ,EAAEC,QAAQ,KAAK;EAClD;EACA;EACA,OACG,IAAAC,iBAAO,EAACF,QAAQ,CAACG,IAAI,EAAEF,QAAQ,CAACE,IAAI,CAAC,IAAI,IAAAD,iBAAO,EAACF,QAAQ,CAACI,EAAE,EAAEH,QAAQ,CAACG,EAAE,CAAC,IAC1E,IAAAF,iBAAO,EAACF,QAAQ,CAACI,EAAE,EAAEH,QAAQ,CAACE,IAAI,CAAC,IAAI,IAAAD,iBAAO,EAACF,QAAQ,CAACG,IAAI,EAAEF,QAAQ,CAACG,EAAE,CAAE;AAEhF,CAAC;;AAED;AACA;AACA;AACA;AACA;AAHAC,OAAA,CAAAN,YAAA,GAAAA,YAAA;AAIO,MAAMO,aAAa,GAAIC,OAAO,IACnCC,MAAM,CAACC,IAAI,CAACF,OAAO,IAAI,CAAC,CAAC,CAAC,CACvBG,IAAI,CAAC,CAAC,CACNC,MAAM,CAAC,CAACC,MAAM,EAAEC,GAAG,KAAK;EACvB,IAAIA,GAAG,KAAK,eAAe,EAAE;IAC3BD,MAAM,CAACC,GAAG,CAAC,GAAGN,OAAO,CAACM,GAAG,CAAC;EAC5B;EACA,OAAOD,MAAM;AACf,CAAC,EAAE,CAAC,CAAC,CAAC;;AAEV;AACA;AACA;AACA;AAHAP,OAAA,CAAAC,aAAA,GAAAA,aAAA;AAIA,MAAMQ,8BAA8B,GAAIC,IAAI,IAAK;EAC/CA,IAAI,GAAG;IAAE,GAAGA,IAAI;IAAEX,EAAE,EAAE;MAAE,GAAGW,IAAI,CAACX;IAAG,CAAC;IAAED,IAAI,EAAE;MAAE,GAAGY,IAAI,CAACZ;IAAK;EAAE,CAAC;EAC9D,MAAMa,EAAE,GAAGD,IAAI,CAACZ,IAAI,CAACc,CAAC;EACtB,MAAMC,EAAE,GAAGH,IAAI,CAACZ,IAAI,CAACgB,CAAC;EACtB,MAAMC,EAAE,GAAGL,IAAI,CAACX,EAAE,CAACa,CAAC;EACpB,MAAMI,EAAE,GAAGN,IAAI,CAACX,EAAE,CAACe,CAAC;EACpB,OAAO;IACLG,CAAC,EAAED,EAAE,GAAGH,EAAE;IACVK,CAAC,EAAEP,EAAE,GAAGI,EAAE;IACVI,CAAC,EAAEJ,EAAE,GAAGF,EAAE,GAAGF,EAAE,GAAGK;EACpB,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMI,sBAAsB,GAAIC,MAAM,IAAKC,IAAI,CAACC,KAAK,CAACF,MAAM,GAAG,KAAK,CAAC,GAAG,KAAK;;AAE7E;AACA;AACA;AACA;AACA;AACO,MAAMG,SAAS,GAAGA,CAACC,KAAK,EAAEC,KAAK,KAAK;EACzC;EACA;EACA;EACA;EACA;EACA,MAAM;IAAET,CAAC,EAAEU,EAAE;IAAET,CAAC,EAAEU,EAAE;IAAET,CAAC,EAAEU;EAAG,CAAC,GAAGpB,8BAA8B,CAACgB,KAAK,CAAC;EACrE,MAAM;IAAER,CAAC,EAAEa,EAAE;IAAEZ,CAAC,EAAEa,EAAE;IAAEZ,CAAC,EAAEa;EAAG,CAAC,GAAGvB,8BAA8B,CAACiB,KAAK,CAAC;EACrE,MAAMO,WAAW,GAAG,EAAE;EACtB,IAAIH,EAAE,KAAK,CAAC,EAAE;IACZG,WAAW,CAACC,IAAI,CAACd,sBAAsB,CAACO,EAAE,GAAGG,EAAE,CAAC,CAAC;EACnD,CAAC,MAAM,IAAIH,EAAE,KAAKG,EAAE,EAAE;IACpB,OAAO,KAAK;EACd;EACA,IAAIC,EAAE,KAAK,CAAC,EAAE;IACZE,WAAW,CAACC,IAAI,CAACd,sBAAsB,CAACQ,EAAE,GAAGG,EAAE,CAAC,CAAC;EACnD,CAAC,MAAM,IAAIH,EAAE,KAAKG,EAAE,EAAE;IACpB,OAAO,KAAK;EACd;EACA,IAAIC,EAAE,KAAK,CAAC,EAAE;IACZC,WAAW,CAACC,IAAI,CAACd,sBAAsB,CAACS,EAAE,GAAGG,EAAE,CAAC,CAAC;EACnD,CAAC,MAAM,IAAIH,EAAE,KAAKG,EAAE,EAAE;IACpB,OAAO,KAAK;EACd;EACA,OAAO,IAAAG,cAAI,EAACF,WAAW,CAAC,CAACG,MAAM,KAAK,CAAC,IAAIX,KAAK,CAACY,IAAI,KAAKX,KAAK,CAACW,IAAI;EAClE;EACA;AACF,CAAC;;AAED;AACA;AACA;AACA;AAHArC,OAAA,CAAAwB,SAAA,GAAAA,SAAA;AAIO,MAAMc,2BAA2B,GAAIC,MAAM,IAAK;EACrD;EACA;EACA,OAAO,CAACA,MAAM,IAAI,EAAE,EAAEC,GAAG,CAAC,CAACC,KAAK,EAAEC,KAAK,MAAM;IAAE5C,IAAI,EAAE2C,KAAK;IAAE1C,EAAE,EAAEwC,MAAM,CAAC,CAACG,KAAK,GAAG,CAAC,IAAIH,MAAM,CAACH,MAAM;EAAE,CAAC,CAAC,CAAC;AACzG,CAAC;;AAED;AACA;AACA;AACA;AAHApC,OAAA,CAAAsC,2BAAA,GAAAA,2BAAA;AAIO,MAAMK,uBAAuB,GAAIC,QAAQ,IAAK;EACnDA,QAAQ,GAAGA,QAAQ,IAAI,EAAE;EACzB;EACA;EACA;EACA,OAAO,IAAAC,kBAAQ,EAACD,QAAQ,EAAE,CAACE,EAAE,EAAEC,EAAE,KAAKrD,YAAY,CAACoD,EAAE,EAAEC,EAAE,CAAC,CAAC;AAC7D,CAAC;;AAED;AACA;AACA;AACA;AAHA/C,OAAA,CAAA2C,uBAAA,GAAAA,uBAAA;AAIO,MAAMK,qBAAqB,GAAIJ,QAAQ,IAAK;EACjDA,QAAQ,GAAGA,QAAQ,IAAI,EAAE;EACzB;EACA,OAAOA,QAAQ,CAACK,MAAM,CAAEC,OAAO,IAAK,CAAC,IAAArD,iBAAO,EAACqD,OAAO,CAACpD,IAAI,EAAEoD,OAAO,CAACnD,EAAE,CAAC,CAAC;AACzE,CAAC;;AAED;AACA;AACA;AACA;AACA;AAJAC,OAAA,CAAAgD,qBAAA,GAAAA,qBAAA;AAKO,MAAMG,YAAY,GAAGA,CAACC,KAAK,EAAEC,KAAK,KAAK;EAC5C,MAAM;IAAEd,MAAM,EAAEe;EAAQ,CAAC,GAAGF,KAAK;EACjC,MAAM;IAAEb,MAAM,EAAEgB;EAAQ,CAAC,GAAGF,KAAK;EACjC;EACA,MAAMG,SAAS,GAAGlB,2BAA2B,CAACgB,OAAO,CAAC;EACtD,MAAMG,SAAS,GAAGnB,2BAA2B,CAACiB,OAAO,CAAC;EACtD,MAAMG,qBAAqB,GAAGf,uBAAuB,CAACK,qBAAqB,CAACQ,SAAS,CAAC,CAAC;EACvF,MAAMG,qBAAqB,GAAGhB,uBAAuB,CAACK,qBAAqB,CAACS,SAAS,CAAC,CAAC;EACvF,MAAMG,kBAAkB,GAAG,IAAAC,wBAAc,EAACH,qBAAqB,EAAEC,qBAAqB,EAAEjE,YAAY,CAAC;EACrG,MAAMoE,kBAAkB,GAAG,IAAAD,wBAAc,EAACF,qBAAqB,EAAED,qBAAqB,EAAEhE,YAAY,CAAC;EACrG,OAAO,CAAC,CAACkE,kBAAkB,IAAI,CAACA,kBAAkB,CAACxB,MAAM,MAAM,CAAC0B,kBAAkB,IAAI,CAACA,kBAAkB,CAAC1B,MAAM,CAAC;AACnH,CAAC;;AAED;AACA;AACA;AAFApC,OAAA,CAAAmD,YAAA,GAAAA,YAAA;AAGO,MAAMY,UAAU,GAAA/D,OAAA,CAAA+D,UAAA,GAAG;EACxBrD,IAAI,EAAEA,CAACsD,UAAU,EAAEC,IAAI,KAAKzC,SAAS,CAACwC,UAAU,EAAEC,IAAI,CAAC;EACvDC,OAAO,EAAEA,CAACF,UAAU,EAAEG,IAAI,KAAKhB,YAAY,CAACa,UAAU,EAAEG,IAAI;AAC9D,CAAC;;AAED;AACA;AACA;AACA;AACA,MAAMC,aAAa,GAAI3B,KAAK,IAAKA,KAAK,IAAI4B,MAAM,CAACC,QAAQ,CAAC7B,KAAK,CAAC7B,CAAC,CAAC,IAAIyD,MAAM,CAACC,QAAQ,CAAC7B,KAAK,CAAC3B,CAAC,CAAC;;AAE9F;AACA;AACA;AACA;AACA,MAAMyD,cAAc,GAAIC,IAAI,IAAKA,IAAI,IAAIC,YAAY,CAAChC,KAAK,CAAC+B,IAAI,CAAC1E,IAAI,CAAC,IAAI2E,YAAY,CAAChC,KAAK,CAAC+B,IAAI,CAACzE,EAAE,CAAC;;AAErG;AACA;AACA;AACA;AACA,MAAM2E,cAAc,GAAIF,IAAI,IAC1BA,IAAI,IACJA,IAAI,CAACjC,MAAM,IACXiC,IAAI,CAACjC,MAAM,CAACH,MAAM,IAClB,CAACoC,IAAI,CAACjC,MAAM,CAACU,MAAM,CAAER,KAAK,IAAK2B,aAAa,CAAC3B,KAAK,CAAC,CAAC,IAAI,EAAE,EAAEL,MAAM,KAAKoC,IAAI,CAACjC,MAAM,CAACH,MAAM;;AAE3F;AACA;AACA;AACA,MAAMqC,YAAY,GAAG;EACnBhC,KAAK,EAAE2B,aAAa;EACpB1D,IAAI,EAAE6D,cAAc;EACpBL,OAAO,EAAEQ;AACX,CAAC;;AAED;AACA;AACA;AACA;AACO,MAAMC,oBAAoB,GAAIzE,OAAO,IAC1CA,OAAO,GACH,CAACA,OAAO,IAAI,EAAE,EAAE+C,MAAM,CAAC,CAAC;EAAE2B,IAAI;EAAE,GAAGC;AAAO,CAAC,KAAMJ,YAAY,CAACG,IAAI,CAAC,GAAGH,YAAY,CAACG,IAAI,CAAC,CAACC,MAAM,CAAC,GAAG,KAAM,CAAC,GAC1G,EAAE;AAAC7E,OAAA,CAAA2E,oBAAA,GAAAA,oBAAA","ignoreList":[]}

package/controller/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pie-element/graphing-solution-set-controller",
   "private": true,
-  "version": "5.3.0-beta.12",
+  "version": "5.3.0-beta.13",
   "description": "",
   "main": "lib/index.js",
   "module": "src/index.js",

package/lib/index.js

@@ -0,0 +1,165 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "Component", {
+  enumerable: true,
+  get: function () {
+    return _main.default;
+  }
+});
+exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _react = _interopRequireDefault(require("react"));
+var _client = require("react-dom/client");
+var _piePlayerEvents = require("@pie-framework/pie-player-events");
+var _mathRendering = require("@pie-lib/math-rendering");
+var _utils = require("./utils");
+var _main = _interopRequireDefault(require("./main"));
+class Graphing extends HTMLElement {
+  constructor() {
+    super();
+    /*
+     * Is complete function
+     * @param {object} answer - Answer object
+     * */
+    (0, _defineProperty2.default)(this, "isComplete", answer => Array.isArray(answer) && answer.length > 0);
+    /*
+     * Callback function to change answers
+     * @param {object} answer - Answer object
+     * @param {boolean} isUndoOperation - Boolean value to check if undo operation is performed
+     * */
+    (0, _defineProperty2.default)(this, "changeAnswers", (answer, isUndoOperation) => {
+      // avoid removeInvalidObjects when undo or redo operations are executed
+      // in order to preserve the logic of undo and redo
+      const {
+        gssData
+      } = this._model;
+      if (gssData.selectedTool === 'lineA' && answer.length > 0) {
+        answer[0].fill = gssData['lineA'].lineType;
+      }
+      if (gssData.selectedTool === 'lineB' && answer.length > 1) {
+        answer[1].fill = gssData['lineB'].lineType;
+      }
+      if (answer.length === 0) {
+        gssData.selectedTool = 'lineA';
+        this._model.gssData = gssData;
+      }
+      if (!isUndoOperation) {
+        this._session.answer = (0, _utils.removeInvalidAnswers)(answer);
+      } else {
+        this._session.answer = answer;
+      }
+      this.dispatchEvent(new _piePlayerEvents.SessionChangedEvent(this.tagName.toLowerCase(), this.isComplete(this._session.answer)));
+      this._render();
+    });
+    /*
+     * Function to set gssData object and session object
+     * @param {object} gssData - GSS Data object
+     * @param {object} session - Session object
+     * */
+    (0, _defineProperty2.default)(this, "setGssData", (gssData, session) => {
+      this._model.gssData = gssData;
+      this._session = session;
+      this.dispatchEvent(new _piePlayerEvents.SessionChangedEvent(this.tagName.toLowerCase(), this.isComplete(this._session.answer)));
+      this._render();
+    });
+    this._root = null;
+  }
+
+  /*
+   * Function to set model
+   * @param {object} m - Model object
+   * */
+  set model(m) {
+    this._model = m;
+    this._render();
+  }
+
+  /*
+   * Function to set session
+   * @param {object} s - Session object
+   * */
+  set session(s) {
+    this._session = s;
+    if (!this._session.answer) {
+      this._session.answer = [];
+    }
+    const {
+      answer
+    } = this._session || {};
+    const {
+      gssLineData,
+      domain,
+      range
+    } = this._model;
+    let section = answer && answer.filter(mark => mark.type === 'polygon').length > 0;
+    if (gssLineData.numberOfLines === 1) {
+      this._model.gssData = {
+        numberOfLines: 1,
+        selectedTool: section ? 'solutionSet' : 'lineA',
+        sections: [],
+        lineA: {
+          lineType: answer && answer.length > 0 ? answer[0].fill : 'Solid'
+        }
+      };
+    } else {
+      this._model.gssData = {
+        numberOfLines: 2,
+        selectedTool: section ? 'solutionSet' : 'lineA',
+        sections: [],
+        lineA: {
+          lineType: answer && answer.length > 0 ? answer[0].fill : 'Solid'
+        },
+        lineB: {
+          lineType: answer && answer.length > 1 ? answer[1].fill : 'Solid'
+        }
+      };
+    }
+    if (section) {
+      this._model.gssData = (0, _utils.findSectionsInSolutionSet)(this._model.gssData, answer, domain, range);
+    }
+    this._render();
+  }
+
+  /*
+   * Function to get session
+   * */
+  get session() {
+    return this._session;
+  }
+  connectedCallback() {
+    this._render();
+  }
+  /*
+   * Render function
+   * */
+  _render() {
+    if (!this._model || !this._session) {
+      return;
+    }
+    const el = /*#__PURE__*/_react.default.createElement(_main.default, {
+      model: this._model,
+      session: this._session,
+      onAnswersChange: this.changeAnswers,
+      setGssData: this.setGssData
+    });
+    if (!this._root) {
+      this._root = (0, _client.createRoot)(this);
+    }
+    this._root.render(el);
+    queueMicrotask(() => {
+      (0, _mathRendering.renderMath)(this);
+    });
+  }
+  disconnectedCallback() {
+    if (this._root) {
+      this._root.unmount();
+      this._root = null;
+    }
+  }
+}
+exports.default = Graphing;
+//# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","names":["_react","_interopRequireDefault","require","_client","_piePlayerEvents","_mathRendering","_utils","_main","Graphing","HTMLElement","constructor","_defineProperty2","default","answer","Array","isArray","length","isUndoOperation","gssData","_model","selectedTool","fill","lineType","_session","removeInvalidAnswers","dispatchEvent","SessionChangedEvent","tagName","toLowerCase","isComplete","_render","session","_root","model","m","s","gssLineData","domain","range","section","filter","mark","type","numberOfLines","sections","lineA","lineB","findSectionsInSolutionSet","connectedCallback","el","React","createElement","Main","onAnswersChange","changeAnswers","setGssData","createRoot","render","queueMicrotask","renderMath","disconnectedCallback","unmount","exports"],"sources":["../src/index.js"],"sourcesContent":["import React from 'react';\nimport { createRoot } from 'react-dom/client';\nimport { SessionChangedEvent } from '@pie-framework/pie-player-events';\nimport { renderMath } from '@pie-lib/math-rendering';\nimport { findSectionsInSolutionSet, removeInvalidAnswers } from './utils';\nimport Main from './main';\n\nexport { Main as Component };\n\nexport default class Graphing extends HTMLElement {\n  constructor() {\n    super();\n    this._root = null;\n  }\n\n  /*\n   * Function to set model\n   * @param {object} m - Model object\n   * */\n  set model(m) {\n    this._model = m;\n    this._render();\n  }\n\n  /*\n   * Function to set session\n   * @param {object} s - Session object\n   * */\n  set session(s) {\n    this._session = s;\n    if (!this._session.answer) {\n      this._session.answer = [];\n    }\n    const { answer } = this._session || {};\n    const { gssLineData, domain, range } = this._model;\n    let section = answer && answer.filter((mark) => mark.type === 'polygon').length > 0;\n    if (gssLineData.numberOfLines === 1) {\n      this._model.gssData = {\n        numberOfLines: 1,\n        selectedTool: section ? 'solutionSet' : 'lineA',\n        sections: [],\n        lineA: {\n          lineType: answer && answer.length > 0 ? answer[0].fill : 'Solid',\n        },\n      };\n    } else {\n      this._model.gssData = {\n        numberOfLines: 2,\n        selectedTool: section ? 'solutionSet' : 'lineA',\n        sections: [],\n        lineA: {\n          lineType: answer && answer.length > 0 ? answer[0].fill : 'Solid',\n        },\n        lineB: {\n          lineType: answer && answer.length > 1 ? answer[1].fill : 'Solid',\n        },\n      };\n    }\n    if (section) {\n      this._model.gssData = findSectionsInSolutionSet(this._model.gssData, answer, domain, range);\n    }\n    this._render();\n  }\n\n  /*\n   * Function to get session\n   * */\n  get session() {\n    return this._session;\n  }\n\n  connectedCallback() {\n    this._render();\n  }\n\n  /*\n   * Is complete function\n   * @param {object} answer - Answer object\n   * */\n  isComplete = (answer) => Array.isArray(answer) && answer.length > 0;\n\n  /*\n   * Callback function to change answers\n   * @param {object} answer - Answer object\n   * @param {boolean} isUndoOperation - Boolean value to check if undo operation is performed\n   * */\n  changeAnswers = (answer, isUndoOperation) => {\n    // avoid removeInvalidObjects when undo or redo operations are executed\n    // in order to preserve the logic of undo and redo\n    const { gssData } = this._model;\n    if (gssData.selectedTool === 'lineA' && answer.length > 0) {\n      answer[0].fill = gssData['lineA'].lineType;\n    }\n    if (gssData.selectedTool === 'lineB' && answer.length > 1) {\n      answer[1].fill = gssData['lineB'].lineType;\n    }\n    if (answer.length === 0) {\n      gssData.selectedTool = 'lineA';\n      this._model.gssData = gssData;\n    }\n    if (!isUndoOperation) {\n      this._session.answer = removeInvalidAnswers(answer);\n    } else {\n      this._session.answer = answer;\n    }\n    this.dispatchEvent(new SessionChangedEvent(this.tagName.toLowerCase(), this.isComplete(this._session.answer)));\n    this._render();\n  };\n\n  /*\n   * Function to set gssData object and session object\n   * @param {object} gssData - GSS Data object\n   * @param {object} session - Session object\n   * */\n  setGssData = (gssData, session) => {\n    this._model.gssData = gssData;\n    this._session = session;\n    this.dispatchEvent(new SessionChangedEvent(this.tagName.toLowerCase(), this.isComplete(this._session.answer)));\n    this._render();\n  };\n\n  /*\n   * Render function\n   * */\n  _render() {\n    if (!this._model || !this._session) {\n      return;\n    }\n    const el = React.createElement(Main, {\n      model: this._model,\n      session: this._session,\n      onAnswersChange: this.changeAnswers,\n      setGssData: this.setGssData,\n    });\n    if (!this._root) {\n      this._root = createRoot(this);\n    }\n    this._root.render(el);\n    queueMicrotask(() => {\n      renderMath(this);\n    });\n  }\n\n  disconnectedCallback() {\n    if (this._root) {\n      this._root.unmount();\n      this._root = null;\n    }\n  }\n}\n"],"mappings":"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","ignoreList":[]}