@pie-element/graphing-solution-set 6.1.2-next.0 → 6.1.2-next.2

package/dist/controller/index.d.ts

@@ -14,7 +14,7 @@ export declare const getAnswerCorrected: ({ sessionAnswers, marks: correctAnswer
 export declare const getBestAnswer: (question: any, session: any, env?: {}) => {
     bestScore: number;
     bestScoreAnswerKey: null;
-    answersCorrected: any;
+    answersCorrected: any[];
     foundOneSolution: boolean;
 };
 export declare const normalize: (question: any) => any;

package/dist/controller/index.js

@@ -1,28 +1,26 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/cloneDeep.js";
-import t from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isEmpty.js";
-import n from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/uniqWith.js";
-import r from "./defaults.js";
-import { equalMarks as i, removeInvalidAnswers as a, sortedAnswers as o } from "./utils.js";
-import s from "debug";
+import e from "./defaults.js";
+import { equalMarks as t, removeInvalidAnswers as n, sortedAnswers as r } from "./utils.js";
+import i from "debug";
+import { cloneDeep as a, isEmpty as o, uniqWith as s } from "@pie-element/shared-lodash";
 //#region src/controller/index.ts
-var c = s("@pie-element:graphing-solution-set:controller"), l = () => ({ line: [] }), u = (e, t) => !!(e && t && e.type === t.type && i[e.type] && i[e.type](e, t)), d = ({ sessionAnswers: t, marks: n }) => {
-	t ||= [], n ||= [];
-	let r = e(t).reduce((e, t) => (t.correctness = n.find((e) => u(t, e)) ? "correct" : "incorrect", [...e, t]), []), i = e(n).reduce((e, n) => t.find((e) => u(n, e)) ? e : [...e, {
+var c = i("@pie-element:graphing-solution-set:controller"), l = () => ({ line: [] }), u = (e, n) => !!(e && n && e.type === n.type && t[e.type] && t[e.type](e, n)), d = ({ sessionAnswers: e, marks: t }) => {
+	e ||= [], t ||= [];
+	let n = a(e).reduce((e, n) => (n.correctness = t.find((e) => u(n, e)) ? "correct" : "incorrect", [...e, n]), []), r = a(t).reduce((t, n) => e.find((e) => u(n, e)) ? t : [...t, {
 		...n,
 		correctness: "missing"
 	}], []);
-	return [...r, ...i];
-}, f = (r, i, a = {}) => {
-	let { answers: s = {}, scoringType: c } = r || {}, { answer: f } = i || {};
-	Object.entries(s || {}).forEach(([e, t]) => s[e] = {
+	return [...n, ...r];
+}, f = (e, t, n = {}) => {
+	let { answers: i = {}, scoringType: c } = e || {}, { answer: f } = t || {};
+	Object.entries(i || {}).forEach(([e, t]) => i[e] = {
 		...t,
 		marks: t?.marks.filter((e) => !e.building)
-	}), f ||= [], s = t(s) ? { correctAnswer: l() } : {
-		correctAnswer: s.correctAnswer,
-		...o(s)
+	}), f ||= [], i = o(i) ? { correctAnswer: l() } : {
+		correctAnswer: i.correctAnswer,
+		...r(i)
 	};
-	let p = n(f, u);
-	return Object.entries(s).reduce((e, t) => {
+	let p = s(f, u);
+	return Object.entries(i).reduce((e, t) => {
 		let n = t[0], { marks: r } = t[1] || {};
 		if (!r || !r.length) return e;
 		let i = d({
@@ -33,21 +31,21 @@ var c = s("@pie-element:graphing-solution-set:controller"), l = () => ({ line: [
 	}, {
 		bestScore: 0,
 		bestScoreAnswerKey: null,
-		answersCorrected: e(p).map((e) => ({
+		answersCorrected: a(p).map((e) => ({
 			...e,
 			correctness: "incorrect"
 		})),
 		foundOneSolution: !1
 	});
-}, p = (e) => ({
-	...r,
-	...e
+}, p = (t) => ({
+	...e,
+	...t
 });
-function m(e, n, r) {
+function m(e, t, r) {
 	return new Promise((i) => {
-		let o = p(e);
-		n.answer = a(n.answer);
-		let { defaultTool: s, extraCSSRules: l, prompt: u, promptEnabled: d, graph: m, answers: h, toolbarTools: g, ..._ } = o || {}, { arrows: v } = o, { mode: y, role: b } = r || {};
+		let a = p(e);
+		t.answer = n(t.answer);
+		let { defaultTool: s, extraCSSRules: l, prompt: u, promptEnabled: d, graph: m, answers: h, toolbarTools: g, ..._ } = a || {}, { arrows: v } = a, { mode: y, role: b } = r || {};
 		typeof v == "boolean" && (v = v ? {
 			left: !0,
 			right: !0,
@@ -68,30 +66,30 @@ function m(e, n, r) {
 			prompt: d ? u : null,
 			rationale: null,
 			size: m,
-			showToggle: r.mode === "evaluate" && !t(h) && h.correctAnswer && h.correctAnswer.marks && !t(h.correctAnswer.marks),
+			showToggle: r.mode === "evaluate" && !o(h) && h.correctAnswer && h.correctAnswer.marks && !o(h.correctAnswer.marks),
 			teacherInstructions: null,
 			toolbarTools: g,
 			extraCSSRules: l
 		};
 		if (b === "instructor" && (y === "view" || y === "evaluate")) {
-			let { rationale: e, rationaleEnabled: t, teacherInstructions: n, teacherInstructionsEnabled: r } = o || {};
+			let { rationale: e, rationaleEnabled: t, teacherInstructions: n, teacherInstructionsEnabled: r } = a || {};
 			x.rationale = t ? e : null, x.teacherInstructions = r ? n : null;
 		}
-		if (y === "evaluate") if (!t(h) && h.correctAnswer && h.correctAnswer.marks && !t(h.correctAnswer.marks)) {
-			let { answersCorrected: e, bestScoreAnswerKey: t, bestScore: i } = f(o, n, r);
-			x.answersCorrected = e, x.correctResponse = t ? (h[t] || {}).marks : [], x.showToggle = x.showToggle && i !== 1;
-		} else x.answersCorrected = n && n.answer || [], x.correctResponse = [];
+		if (y === "evaluate") if (!o(h) && h.correctAnswer && h.correctAnswer.marks && !o(h.correctAnswer.marks)) {
+			let { answersCorrected: e, bestScoreAnswerKey: n, bestScore: i } = f(a, t, r);
+			x.answersCorrected = e, x.correctResponse = n ? (h[n] || {}).marks : [], x.showToggle = x.showToggle && i !== 1;
+		} else x.answersCorrected = t && t.answer || [], x.correctResponse = [];
 		c("base: ", x), i(x);
 	});
 }
-function h(e, n, r = {}) {
-	return new Promise((i) => {
-		(!n || t(n)) && i({
+function h(e, t, n = {}) {
+	return new Promise((r) => {
+		(!t || o(t)) && r({
 			score: 0,
 			empty: !0
-		}), (r.mode !== "evaluate" || t(e.answers) || e.answers && e.answers.correctAnswer && t(e.answers.correctAnswer.marks)) && i({ score: 0 });
-		let { bestScore: a } = f(e, n, r);
-		i({ score: a });
+		}), (n.mode !== "evaluate" || o(e.answers) || e.answers && e.answers.correctAnswer && o(e.answers.correctAnswer.marks)) && r({ score: 0 });
+		let { bestScore: i } = f(e, t, n);
+		r({ score: i });
 	});
 }
 var g = (e, t) => new Promise((n) => {
@@ -103,10 +101,10 @@ var g = (e, t) => new Promise((n) => {
 		});
 	} else n(null);
 }), _ = (e = {}) => {
-	let { answers: n, gssLineData: r } = e, i = {}, a = {}, o = !1;
-	r.numberOfLines === 1 ? n.correctAnswer.marks.length < 1 ? (o = !0, a.correctAnswer = "At least 1 line object should be defined.") : n.correctAnswer.marks.length === 1 && n.correctAnswer.marks[0].building && (o = !0, a.correctAnswer = "1 or more graph object should be correctly defined.") : n.correctAnswer.marks.length < 2 ? (o = !0, a.correctAnswer = "At least 2 line object should be defined.") : n.correctAnswer.marks.length === 2 && (n.correctAnswer.marks[0].building || n.correctAnswer.marks[1].building) && (o = !0, a.correctAnswer = "1 or more graph object should be correctly defined.");
-	let s = n.correctAnswer.marks.find((e) => e.type === "polygon");
-	return !o && (!r.selectedTool === "solutionSet" || !s) && (a.correctAnswer = "Please select a solution set for the graphing solution set item."), t(a) || (i.correctAnswerErrors = a), i;
+	let { answers: t, gssLineData: n } = e, r = {}, i = {}, a = !1;
+	n.numberOfLines === 1 ? t.correctAnswer.marks.length < 1 ? (a = !0, i.correctAnswer = "At least 1 line object should be defined.") : t.correctAnswer.marks.length === 1 && t.correctAnswer.marks[0].building && (a = !0, i.correctAnswer = "1 or more graph object should be correctly defined.") : t.correctAnswer.marks.length < 2 ? (a = !0, i.correctAnswer = "At least 2 line object should be defined.") : t.correctAnswer.marks.length === 2 && (t.correctAnswer.marks[0].building || t.correctAnswer.marks[1].building) && (a = !0, i.correctAnswer = "1 or more graph object should be correctly defined.");
+	let s = t.correctAnswer.marks.find((e) => e.type === "polygon");
+	return !a && (!n.selectedTool === "solutionSet" || !s) && (i.correctAnswer = "Please select a solution set for the graphing solution set item."), o(i) || (r.correctAnswerErrors = i), r;
 };
 //#endregion
 export { u as compareMarks, g as createCorrectResponseSession, d as getAnswerCorrected, f as getBestAnswer, m as model, p as normalize, h as outcome, _ as validate };

package/dist/controller/utils.d.ts

@@ -6,11 +6,11 @@
  * Manual edits will be overwritten on next sync.
  * To make changes, edit the upstream JavaScript file and run sync again.
  */
-export declare const equalSegment: (segment1: any, segment2: any) => any;
+export declare const equalSegment: (segment1: any, segment2: any) => boolean;
 export declare const sortedAnswers: (answers: any) => {};
 export declare const equalLine: (line1: any, line2: any) => boolean;
 export declare const constructSegmentsFromPoints: (points: any) => any;
-export declare const removeDuplicateSegments: (segments: any) => any;
+export declare const removeDuplicateSegments: (segments: any) => unknown[];
 export declare const removeInvalidSegments: (segments: any) => any;
 export declare const equalPolygon: (poly1: any, poly2: any) => boolean;
 export declare const equalMarks: {

package/dist/controller/utils.js

@@ -1,7 +1,4 @@
-import e from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/differenceWith.js";
-import t from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/isEqual.js";
-import n from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/uniq.js";
-import r from "../node_modules/.bun/lodash-es@4.18.1/node_modules/lodash-es/uniqWith.js";
+import { differenceWith as e, isEqual as t, uniq as n, uniqWith as r } from "@pie-element/shared-lodash";
 //#region src/controller/utils.ts
 var i = (e, n) => t(e.from, n.from) && t(e.to, n.to) || t(e.to, n.from) && t(e.from, n.to), a = (e) => Object.keys(e || {}).sort().reduce((t, n) => (n !== "correctAnswer" && (t[n] = e[n]), t), {}), o = (e) => {
 	e = {