@pie-element/graphing 11.0.4-next.20261011174919 → 11.0.4

package/dist/browser/editor-runtime/controller/index.js

@@ -58,80 +58,71 @@ var f = /* @__PURE__ */ d(c(), 1), p = {
 		"sine",
 		"vector"
 	]
-}, m = (e, t) => (e = { ...e }, t = { ...t }, n(e.x, t.x) && n(e.y, t.y)), h = (e, t) => {
+}, m = (e) => ({ ...e }), h = (e, t) => (e = { ...e }, t = { ...t }, n(e.x, t.x) && n(e.y, t.y)), g = (e, t) => {
 	let r = !0;
 	return e = { ...e }, t = { ...t }, (e.label || t.label) && (r = n(e.label, t.label)), n(e.x, t.x) && n(e.y, t.y) && r;
-}, g = (e, t) => n(e.from, t.from) && n(e.to, t.to) || n(e.to, t.from) && n(e.from, t.to), _ = (e, t) => n(e.from, t.from) && n(e.to, t.to), v = (e) => Object.keys(e || {}).sort().reduce((t, n) => (n !== "correctAnswer" && (t[n] = e[n]), t), {}), y = (e) => {
-	e = {
-		...e,
-		to: { ...e.to },
-		from: { ...e.from }
-	};
-	let t = e.from.x, n = e.from.y, r = e.to.x, i = e.to.y;
+}, _ = (e, t) => n(e.from, t.from) && n(e.to, t.to) || n(e.to, t.from) && n(e.from, t.to), v = (e, t) => n(e.from, t.from) && n(e.to, t.to), y = (e) => Object.keys(e || {}).sort().reduce((t, n) => (e && n !== "correctAnswer" && (t[n] = e[n]), t), {}), b = (e) => {
+	let t = m(e.from), n = m(e.to), r = t.x, i = t.y, a = n.x, o = n.y;
 	return {
-		a: i - n,
-		b: t - r,
-		c: r * n - t * i
+		a: o - i,
+		b: r - a,
+		c: a * i - r * o
 	};
-}, b = (e) => Math.round(e * 1e4) / 1e4, x = (e, t) => {
-	let { a: n, b: i, c: a } = y(e), { a: o, b: s, c } = y(t), l = [];
-	if (o !== 0) l.push(b(n / o));
+}, x = (e) => Math.round(e * 1e4) / 1e4, S = (e, t) => {
+	let { a: n, b: i, c: a } = b(e), { a: o, b: s, c } = b(t), l = [];
+	if (o !== 0) l.push(x(n / o));
 	else if (n !== o) return !1;
-	if (s !== 0) l.push(b(i / s));
+	if (s !== 0) l.push(x(i / s));
 	else if (i !== s) return !1;
-	if (c !== 0) l.push(b(a / c));
+	if (c !== 0) l.push(x(a / c));
 	else if (a !== c) return !1;
 	return r(l).length === 1;
-}, S = (e, t) => {
-	e = {
-		...e,
-		to: { ...e.to },
-		from: { ...e.from }
-	}, t = {
-		...t,
-		to: { ...t.to },
-		from: { ...t.from }
-	};
-	let n = (e.to.y - e.from.y) / (e.to.x - e.from.x), r = (t.to.y - t.from.y) / (t.to.x - t.from.x), i = Math.atan2(e.to.y - e.from.y, e.to.x - e.from.x) * 180 / Math.PI, a = Math.atan2(t.to.y - t.from.y, t.to.x - t.from.x) * 180 / Math.PI;
-	return n === r && e.from.x === t.from.x && e.from.y === t.from.y && i === a;
-}, C = (e) => (e || []).map((t, n) => ({
-	from: t,
-	to: e[(n + 1) % e.length]
-})), w = (e) => (e ||= [], l(e, (e, t) => g(e, t))), T = (e) => (e ||= [], e.filter((e) => !n(e.from, e.to))), E = (e, t) => {
-	let { points: n } = e, { points: r } = t, i = C(n), a = C(r), o = w(T(i)), s = w(T(a)), c = u(o, s, g), l = u(s, o, g);
+}, C = (e, t) => {
+	let n = {
+		from: m(e.from),
+		to: m(e.to)
+	}, r = {
+		from: m(t.from),
+		to: m(t.to)
+	}, i = (n.to.y - n.from.y) / (n.to.x - n.from.x), a = (r.to.y - r.from.y) / (r.to.x - r.from.x), o = Math.atan2(n.to.y - n.from.y, n.to.x - n.from.x) * 180 / Math.PI, s = Math.atan2(r.to.y - r.from.y, r.to.x - r.from.x) * 180 / Math.PI;
+	return i === a && n.from.x === r.from.x && n.from.y === r.from.y && o === s;
+}, w = (e) => {
+	let t = e || [];
+	return t.map((e, n) => ({
+		from: e,
+		to: t[(n + 1) % t.length]
+	}));
+}, T = (e) => (e ||= [], l(e, (e, t) => _(e, t))), E = (e) => (e ||= [], e.filter((e) => !n(e.from, e.to))), D = (e, t) => {
+	let { points: n } = e, { points: r } = t, i = w(n), a = w(r), o = T(E(i)), s = T(E(a)), c = u(o, s, _), l = u(s, o, _);
 	return (!c || !c.length) && (!l || !l.length);
-}, D = (e, t) => {
-	if (e = {
-		...e,
-		root: { ...e.root },
-		edge: { ...e.edge }
-	}, t = {
-		...t,
-		root: { ...t.root },
-		edge: { ...t.edge }
-	}, n(t.edge, e.edge) && n(t.root, e.root)) return !0;
-	let r = Math.sqrt((e.edge.x - e.root.x) ** 2 + (e.edge.y - e.root.y) ** 2), i = Math.sqrt((t.edge.x - t.root.x) ** 2 + (t.edge.y - t.root.y) ** 2);
-	return n(t.root, e.root) && n(r, i);
 }, O = (e, t) => {
-	let n = ({ root: e, edge: t }) => {
-		e = { ...e }, t = { ...t };
-		let { amplitude: n, freq: r } = s(e, t), i = Math.abs(e.y - t.y) * 2, a = Math.abs(e.x - t.x) * 2, o = t.x, c = t.y;
-		for (; o < 0 && a !== 0;) o += a, c = c < e.y ? c + i : c - i;
-		for (; o - a > 0 && a !== 0;) o -= a, c = c < e.y ? c + i : c - i;
+	let r = {
+		root: m(e.root),
+		edge: m(e.edge)
+	}, i = {
+		root: m(t.root),
+		edge: m(t.edge)
+	};
+	if (n(i.edge, r.edge) && n(i.root, r.root)) return !0;
+	let a = Math.sqrt((r.edge.x - r.root.x) ** 2 + (r.edge.y - r.root.y) ** 2), o = Math.sqrt((i.edge.x - i.root.x) ** 2 + (i.edge.y - i.root.y) ** 2);
+	return n(i.root, r.root) && n(a, o);
+}, k = (e, t) => {
+	let n = (e) => {
+		let t = m(e.root), n = m(e.edge), { amplitude: r, freq: i } = s(t, n), a = Math.abs(t.y - n.y) * 2, o = Math.abs(t.x - n.x) * 2, c = n.x, l = n.y;
+		for (; c < 0 && o !== 0;) c += o, l = l < t.y ? l + a : l - a;
+		for (; c - o > 0 && o !== 0;) c -= o, l = l < t.y ? l + a : l - a;
 		return {
-			amplitude: b(n),
-			freq: b(r),
-			min: b(t.y < e.y ? t.y : t.y - i),
-			max: b(t.y < e.y ? t.y + i : t.y),
-			edgeAboveZeroX: b(o),
-			edgeAboveZeroY: b(c)
+			amplitude: x(r),
+			freq: x(i),
+			min: x(n.y < t.y ? n.y : n.y - a),
+			max: x(n.y < t.y ? n.y + a : n.y),
+			edgeAboveZeroX: x(c),
+			edgeAboveZeroY: x(l)
 		};
-	}, r = n(e), i = n(t), { amplitude: a, freq: o, min: c, max: l, edgeAboveZeroX: u, edgeAboveZeroY: d } = r, { amplitude: f, freq: p, min: m, max: h, edgeAboveZeroX: g, edgeAboveZeroY: _ } = i;
-	return Math.abs(a) === Math.abs(f) && Math.abs(o) === Math.abs(p) && c === m && l === h && u === g && d === _;
-}, k = (e, t) => {
-	let { edge: n } = e, { edge: r } = t, { root: i } = e, { root: a } = t;
-	i = { ...i }, a = { ...a };
-	let s = n || { ...i }, c = r || { ...a }, l = {
+	}, r = n(e), i = n(t), { amplitude: a, freq: o, min: c, max: l, edgeAboveZeroX: u, edgeAboveZeroY: d } = r, { amplitude: f, freq: p, min: h, max: g, edgeAboveZeroX: _, edgeAboveZeroY: v } = i;
+	return Math.abs(a) === Math.abs(f) && Math.abs(o) === Math.abs(p) && c === h && l === g && u === _ && d === v;
+}, A = (e, t) => {
+	let { edge: n } = e, { edge: r } = t, i = m(e.root), a = m(t.root), s = n || { ...i }, c = r || { ...a }, l = {
 		x: i.x - (s.x - i.x),
 		y: s.y
 	}, u = {
@@ -139,44 +130,40 @@ var f = /* @__PURE__ */ d(c(), 1), p = {
 		y: c.y
 	};
 	if (!n || !r) return !1;
-	let { a: d, b: f, c: p } = o(i, n, l), { a: m, b: h, c: g } = o(a, r, u), _ = (e) => Math.round(e * 1e4) / 1e4;
-	return _(d) === _(m) && _(f) === _(h) && _(p) === _(g);
-}, A = (e, r) => {
-	let { edge: i } = e, { edge: a } = r, { root: o } = e, { root: s } = r;
-	o = { ...o }, s = { ...s };
-	let c = i || { ...o }, l = a || { ...s }, u = t(o, c), d = t(s, l);
+	let { a: d, b: f, c: p } = o(i, n, l), { a: h, b: g, c: _ } = o(a, r, u), v = (e) => Math.round(e * 1e4) / 1e4;
+	return v(d) === v(h) && v(f) === v(g) && v(p) === v(_);
+}, j = (e, r) => {
+	let { edge: i } = e, { edge: a } = r, o = m(e.root), s = m(r.root), c = i || { ...o }, l = a || { ...s }, u = t(o, c), d = t(s, l);
 	return n(s, o) && n(d, u);
-}, j = (e, t) => {
-	let { edge: r } = e, { edge: a } = t, { root: o } = e, { root: s } = t;
-	o = { ...o }, s = { ...s };
-	let c = r || { ...o }, l = a || { ...s }, { a: u, b: d } = i(o, c), { a: f, b: p } = i(s, l);
+}, M = (e, t) => {
+	let { edge: r } = e, { edge: a } = t, o = m(e.root), s = m(t.root), c = r || { ...o }, l = a || { ...s }, { a: u, b: d } = i(o, c), { a: f, b: p } = i(s, l);
 	return n(f, u) && n(p, d);
-}, M = {
-	circle: (e, t) => D(e, t),
-	line: (e, t) => x(e, t),
-	parabola: (e, t) => k(e, t),
-	absolute: (e, t) => A(e, t),
-	exponential: (e, t) => j(e, t),
-	point: (e, t) => m(e, t),
-	polygon: (e, t) => E(e, t),
-	ray: (e, t) => S(e, t),
-	segment: (e, t) => g(e, t),
-	sine: (e, t) => O(e, t),
-	vector: (e, t) => _(e, t)
-}, N = Object.defineProperty, P = /* @__PURE__ */ ((e, t) => {
+}, N = {
+	circle: (e, t) => O(e, t),
+	line: (e, t) => S(e, t),
+	parabola: (e, t) => A(e, t),
+	absolute: (e, t) => j(e, t),
+	exponential: (e, t) => M(e, t),
+	point: (e, t) => h(e, t),
+	polygon: (e, t) => D(e, t),
+	ray: (e, t) => C(e, t),
+	segment: (e, t) => _(e, t),
+	sine: (e, t) => k(e, t),
+	vector: (e, t) => v(e, t)
+}, P = Object.defineProperty, F = /* @__PURE__ */ ((e, t) => {
 	let n = {};
-	for (var r in e) N(n, r, {
+	for (var r in e) P(n, r, {
 		get: e[r],
 		enumerable: !0
 	});
-	return t || N(n, Symbol.toStringTag, { value: "Module" }), n;
-})({ enabled: () => F });
-function F(e, t, n) {
+	return t || P(n, Symbol.toStringTag, { value: "Module" }), n;
+})({ enabled: () => I });
+function I(e, t, n) {
 	return e?.partialScoring === !1 || t?.partialScoring === !1 ? !1 : typeof n != "boolean" || n;
 }
 //#endregion
 //#region src/controller/index.ts
-var I = (0, f.default)("@pie-element:graphing:controller"), L = () => ({
+var L = (0, f.default)("@pie-element:graphing:controller"), R = () => ({
 	point: [],
 	segment: [],
 	line: [],
@@ -188,66 +175,69 @@ var I = (0, f.default)("@pie-element:graphing:controller"), L = () => ({
 	parabola: [],
 	absolute: [],
 	exponential: []
-}), R = {
+}), z = {
 	incorrect: 0,
 	correct: 1,
 	missing: 2
-}, z = (e, t) => !!(e && t && e.type === t.type && M[e.type] && M[e.type](e, t)), B = (e, t) => e.label === t.label ? "correct" : "incorrect", V = ({ sessionAnswers: t, marks: n, withPointLabel: r = !1 }) => {
-	t ||= [], n ||= [];
-	let i = e(t).reduce((e, t) => {
-		let i = n.find((e) => z(t, e));
-		return t.correctness = (i && t.type === "point" && r ? h(t, i) : i) ? "correct" : "incorrect", i && (t.correctnesslabel = B(t, i), t.correctlabel = i.label ? i.label : "", t.label = t.label ? t.label : ""), [...e, t];
-	}, []), a = e(n).reduce((e, n) => t.find((e) => z(n, e)) ? e : [...e, {
-		...n,
+}, B = (e, t) => !!(e && t && e.type === t.type && N[e.type] && N[e.type](e, t)), V = (e, t) => e.label === t.label ? "correct" : "incorrect", H = ({ sessionAnswers: t, marks: n, withPointLabel: r = !1 }) => {
+	let i = t || [], a = n || [], o = e(i).reduce((e, t) => {
+		let n = a.find((e) => B(t, e)), i = (n && t.type === "point" && r ? g(t, n) : n) ? "correct" : "incorrect", o = Object.assign(t, { correctness: i });
+		return n && (o.correctnesslabel = V(o, n), o.correctlabel = n.label ? n.label : "", o.label = o.label ? o.label : ""), [...e, o];
+	}, []), s = e(a).reduce((e, t) => i.find((e) => B(t, e)) ? e : [...e, {
+		...t,
 		correctness: "missing"
 	}], []);
-	return [...i, ...a];
-}, H = ({ scoringType: e, env: t }) => {
-	let n = e;
-	return e && (n = e === "partial scoring"), P.enabled({ partialScoring: n }, t);
-}, U = (t, n, r = {}) => {
-	let { answers: i = {}, scoringType: o } = t || {}, { answer: s } = n || {};
+	return [...o, ...s];
+}, U = ({ scoringType: e, env: t }) => {
+	let n;
+	return e && (n = e === "partial scoring"), F.enabled({ partialScoring: n }, t);
+}, W = (t, n, r = {}) => {
+	let i = t?.answers ?? {}, o = t?.scoringType, { answer: s } = n || {};
 	Object.entries(i || {}).forEach(([e, t]) => i[e] = {
 		...t,
 		marks: t?.marks.filter((e) => !e.building)
-	}), s ||= [], s = s.filter((e) => !e.building), i = a(i) ? { correctAnswer: L() } : {
+	});
+	let c = s || [];
+	c = c.filter((e) => !e.building);
+	let u;
+	u = a(i) ? { correctAnswer: R() } : {
 		correctAnswer: i.correctAnswer,
-		...v(i)
+		...y(i)
 	};
-	let c = H({
+	let d = U({
 		scoringType: o,
 		env: r
-	}), u = l(s, z);
-	return Object.entries(i).reduce((e, t) => {
+	}), f = l(c, B);
+	return Object.entries(u).reduce((e, t) => {
 		let n = t[0], { marks: r } = t[1] || {};
 		if (!r || !r.length) return e;
-		let i = V({
-			sessionAnswers: u,
+		let i = H({
+			sessionAnswers: f,
 			marks: r
-		}), a = V({
-			sessionAnswers: u,
+		}), a = H({
+			sessionAnswers: f,
 			marks: r,
 			withPointLabel: !0
-		}), o = a.filter((e) => e.correctness === "correct"), s = a.filter((e) => e.correctness !== "missing"), l = r.length, d = o.length;
-		return s.length > l && (d -= s.length - l), d < 0 && (d = 0), (d / l > e.bestScore || !e.foundOneSolution) && (c ? e.bestScore = parseFloat((d / l).toFixed(2)) : e.bestScore = Math.floor(d / l), e.bestScoreAnswerKey = n, e.answersCorrected = i, e.foundOneSolution = !0), e;
+		}), o = a.filter((e) => e.correctness === "correct"), s = a.filter((e) => e.correctness !== "missing"), c = r.length, l = o.length;
+		return s.length > c && (l -= s.length - c), l < 0 && (l = 0), (l / c > e.bestScore || !e.foundOneSolution) && (d ? e.bestScore = parseFloat((l / c).toFixed(2)) : e.bestScore = Math.floor(l / c), e.bestScoreAnswerKey = n, e.answersCorrected = i, e.foundOneSolution = !0), e;
 	}, {
 		bestScore: 0,
 		bestScoreAnswerKey: null,
-		answersCorrected: e(u).map((e) => ({
+		answersCorrected: e(f).map((e) => ({
 			...e,
 			correctness: "incorrect"
 		})),
 		foundOneSolution: !1
 	});
-}, W = (e) => ({
+}, G = (e) => ({
 	...p,
 	...e
 });
-function G(e, t, n) {
+function K(e, t, n) {
 	return new Promise((r) => {
-		let i = W(e);
+		let i = G(e);
 		t ??= {};
-		let { defaultTool: o, extraCSSRules: s, prompt: c, promptEnabled: l, graph: u, answers: d, toolbarTools: f, ...p } = i || {}, { arrows: m } = i, { mode: h, role: g } = n || {};
+		let { defaultTool: o, extraCSSRules: s, prompt: c, promptEnabled: l, graph: u, answers: d, toolbarTools: f, ...p } = i, { arrows: m } = i, h = n?.mode, g = n?.role;
 		typeof m == "boolean" && (m = m ? {
 			left: !0,
 			right: !0,
@@ -275,24 +265,24 @@ function G(e, t, n) {
 			extraCSSRules: s
 		};
 		if (g === "instructor" && (h === "view" || h === "evaluate")) {
-			let { rationale: e, rationaleEnabled: t, teacherInstructions: n, teacherInstructionsEnabled: r } = i || {};
+			let { rationale: e, rationaleEnabled: t, teacherInstructions: n, teacherInstructionsEnabled: r } = i;
 			y.rationale = t ? e : null, y.teacherInstructions = r ? n : null;
 		}
 		if (h === "evaluate") if (!a(d) && d.correctAnswer && d.correctAnswer.marks && !a(d.correctAnswer.marks)) {
-			let { answersCorrected: e, bestScoreAnswerKey: r, bestScore: a } = U(i, t, n);
-			y.answersCorrected = e.sort((e, t) => R[e.correctness] - R[t.correctness]), y.correctResponse = r ? (d[r] || {}).marks : [], y.showToggle = y.showToggle && a !== 1;
+			let { answersCorrected: e, bestScoreAnswerKey: r, bestScore: a } = W(i, t, n);
+			y.answersCorrected = e.sort((e, t) => z[e.correctness] - z[t.correctness]), y.correctResponse = r ? (d[r] || {}).marks : [], y.showToggle = y.showToggle && a !== 1;
 		} else y.answersCorrected = t && t.answer || [], y.correctResponse = [];
-		I("base: ", y), r(y);
+		L("base: ", y), r(y);
 	});
 }
-var K = (e, t, n) => {
-	let r = [], { answers: i = {}, scoringType: a } = e || {}, o = t && t.answer || [];
+var q = (e, t, n) => {
+	let r = [], i = e?.answers ?? {}, a = e?.scoringType, o = t && t.answer || [];
 	if (!o.length) return ["Student did not interact with the graph."];
 	r.push(`Student added ${o.length} object(s) to the graph.`);
-	let s = H({
+	let s = U({
 		scoringType: a,
 		env: n
-	}), { answersCorrected: c, bestScore: l, bestScoreAnswerKey: u } = U(e, t, n), d = u && i[u] && i[u].marks || [], f = 0, p = 0, m = 0;
+	}), { answersCorrected: c, bestScore: l, bestScoreAnswerKey: u } = W(e, t, n), d = u && i[u] && i[u].marks || [], f = 0, p = 0, m = 0;
 	for (let e = 0; e < c.length; e++) {
 		let t = c[e].correctness;
 		t === "correct" ? f++ : t === "incorrect" ? p++ : t === "missing" && m++;
@@ -306,7 +296,7 @@ var K = (e, t, n) => {
 	}
 	return s ? r.push("Score calculated using partial scoring.") : r.push("Score calculated using all-or-nothing scoring."), r.push(`Final score: ${l}.`), r;
 };
-function q(e, t, n = {}) {
+function J(e, t, n = {}) {
 	return new Promise((r) => {
 		(!t || a(t)) && r({
 			score: 0,
@@ -317,15 +307,15 @@ function q(e, t, n = {}) {
 			empty: !0,
 			logTrace: ["Student did not interact with the graph."]
 		});
-		let { bestScore: i } = U(e, t, n);
+		let { bestScore: i } = W(e, t, n);
 		r({
 			score: i,
 			empty: !1,
-			logTrace: K(e, t, n)
+			logTrace: q(e, t, n)
 		});
 	});
 }
-var J = (e, t) => new Promise((n) => {
+var Y = (e, t) => new Promise((n) => {
 	if (t.mode !== "evaluate" && t.role === "instructor") {
 		let { answers: t } = e || {}, r = [];
 		t && Object.values(t) && (r = (t.correctAnswer || Object.values(t)[0] || {}).marks || []), n({
@@ -333,14 +323,14 @@ var J = (e, t) => new Promise((n) => {
 			id: "1"
 		});
 	} else n(null);
-}), Y = (e) => (e || "").replace(/(<(?!img|iframe|source)([^>]+)>)/gi, ""), X = (e = {}, t = {}) => {
+}), X = (e) => (e || "").replace(/(<(?!img|iframe|source)([^>]+)>)/gi, ""), Z = (e = {}, t = {}) => {
 	let { answers: n, toolbarTools: r } = e, i = {}, o = {};
 	return (r || []).filter((e) => e !== "label").length || (i.toolbarToolsError = "There should be at least 1 tool defined."), [
 		"teacherInstructions",
 		"prompt",
 		"rationale"
 	].forEach((n) => {
-		t[n]?.required && !Y(e[n]) && (i[n] = "This field is required.");
+		t[n]?.required && !X(e[n]) && (i[n] = "This field is required.");
 	}), Object.entries(n || {}).forEach(([e, t]) => {
 		t.marks.length || (o[e] = "At least 1 graph object should be defined."), t.marks.length > 0 && t.marks.forEach((t) => {
 			t.building && (o[e] = "At least 1 graph object is not correctly defined.");
@@ -348,6 +338,6 @@ var J = (e, t) => new Promise((n) => {
 	}), a(o) || (i.correctAnswerErrors = o), i;
 };
 //#endregion
-export { B as comparLabelMarks, z as compareMarks, J as createCorrectResponseSession, V as getAnswerCorrected, U as getBestAnswer, K as getLogTrace, G as model, W as normalize, q as outcome, X as validate };
+export { V as comparLabelMarks, B as compareMarks, Y as createCorrectResponseSession, H as getAnswerCorrected, W as getBestAnswer, q as getLogTrace, K as model, G as normalize, J as outcome, Z as validate };
 
 //# sourceMappingURL=index.js.map