@pie-element/mc-populated-blank 0.3.0-next.21 → 0.3.0-next.23

package/module/print.js

@@ -4963,8 +4963,44 @@ vi(ko, {
 	onAudioEnded: {}
 }, [], []);
 //#endregion
+//#region ../../shared/controller-utils/dist/index.js
+function Ao(e) {
+	return Array.isArray(e) ? e.filter((e) => e != null) : [];
+}
+function jo(e) {
+	let t = [...e];
+	for (let e = t.length - 1; e > 0; e--) {
+		let n = Math.floor(Math.random() * (e + 1));
+		[t[e], t[n]] = [t[n], t[e]];
+	}
+	return t;
+}
+function Mo(e) {
+	return e == null ? !0 : Array.isArray(e) ? e.length === 0 : typeof e == "object" && Object.keys(e).length === 0;
+}
+async function No(e, t, n, r = "value") {
+	let i = Ao(t?.data?.shuffledValues ?? t?.shuffledValues ?? []);
+	if (!t) {
+		console.warn("Unable to save shuffled choices because there's no session.");
+		return;
+	}
+	if (!Mo(i)) return Ao(i.map((t) => e.find((e) => e[r] === t)));
+	let a = jo(e);
+	if (n && typeof n == "function") try {
+		let e = Ao(a.map((e) => e[r]));
+		Mo(e) ? console.error(`shuffledValues is an empty array - refusing to call updateSession. shuffledChoices: ${JSON.stringify(a)}, key: ${r}`) : await n(t.id, t.element, { shuffledValues: e });
+	} catch (e) {
+		console.warn("Unable to save shuffled order for choices"), console.error(e);
+	}
+	else console.warn("Unable to save shuffled choices, shuffle will happen every time.");
+	return a;
+}
+function Po(e, t, n) {
+	return !!(e.lockChoiceOrder || n?.["@pie-element"]?.lockChoiceOrder);
+}
+//#endregion
 //#region src/controller/defaults.ts
-var Ao = { model: {
+var Fo = { model: {
 	prompt: "",
 	promptEnabled: !0,
 	interactionMode: "populate_blank",
@@ -4988,50 +5024,32 @@ var Ao = { model: {
 	locale: "",
 	teacherInstructions: "",
 	teacherInstructionsEnabled: !0
-} }, jo = (e, t) => {
+} }, Io = (e, t) => {
 	if (!t?.choiceId) return "unanswered";
 	let n = e?.correctChoiceId || "";
 	return t.choiceId === n ? "correct" : "incorrect";
-}, Mo = (e, t = {}) => ({
+}, Lo = (e, t = {}) => ({
 	...e,
 	...t,
 	layoutLimits: {
 		...$a,
 		...t?.layoutLimits || {}
 	}
-}), No = (e = {}) => {
+}), Ro = (e = {}) => {
 	let { shuffle: t, ...n } = e || {};
 	return {
-		...Mo(Ao.model, n),
+		...Lo(Fo.model, n),
 		lockChoiceOrder: typeof n.lockChoiceOrder == "boolean" ? n.lockChoiceOrder : t !== !0
 	};
-}, Po = (e, t) => !!e?.lockChoiceOrder || !!t?.["@pie-element"]?.lockChoiceOrder;
-function Fo(e) {
-	let t = [...e];
-	for (let e = t.length - 1; e > 0; e--) {
-		let n = Math.floor(Math.random() * (e + 1));
-		[t[e], t[n]] = [t[n], t[e]];
-	}
-	return t;
-}
-var Io = ({ id: e, labelHtml: t, imageUrl: n, imageAlt: r }) => ({
+}, zo = ({ id: e, labelHtml: t, imageUrl: n, imageAlt: r }) => ({
 	id: e,
 	...t === void 0 ? {} : { labelHtml: t },
 	...n === void 0 ? {} : { imageUrl: n },
 	...r === void 0 ? {} : { imageAlt: r }
-}), Lo = (e) => Array.isArray(e?.data?.shuffledValues) ? e.data.shuffledValues : Array.isArray(e?.shuffledValues) ? e.shuffledValues : [], Ro = (e, t, n) => t.map((t) => e.find((e) => e?.[n] === t)).filter((e) => !!e), zo = async (e, t, n, r) => {
-	let i = Array.isArray(e?.choices) ? [...e.choices] : [];
-	if (!i.length || Po(e, n || {})) return i;
-	let a = Lo(t);
-	if (a.length) return Ro(i, a, "id");
-	let o = Fo(i);
-	if (r && typeof r == "function" && t?.id && t?.element) {
-		let e = o.map((e) => e?.id).filter(Boolean);
-		e.length && await r(t.id, t.element, { shuffledValues: e });
-	}
-	return o;
-}, Bo = async (e, t, n, r) => {
-	let i = t || {}, a = n || {}, o = No(e), s = (await zo(o, i, a, r)).filter((e) => !!e && typeof e == "object").map(Io), c = {
+}), Bo = async (e, t, n, r) => {
+	let i = t || {}, a = n || {}, o = Ro(e), s = Array.isArray(o.choices) ? [...o.choices] : [];
+	s.length && !Po(o, i, a) && (s = await No(s, i, r, "id") ?? s);
+	let c = s.filter((e) => !!e && typeof e == "object").map(zo), l = {
 		prompt: o.promptEnabled ? o.prompt : null,
 		interactionMode: o.interactionMode || "populate_blank",
 		layoutProfile: o.layoutProfile || "",
@@ -5043,7 +5061,7 @@ var Io = ({ id: e, labelHtml: t, imageUrl: n, imageAlt: r }) => ({
 		sentenceHtml: o.sentenceHtml || null,
 		template: o.template,
 		choiceMode: o.choiceMode,
-		choices: s,
+		choices: c,
 		choiceGroupLabel: o.choiceGroupLabel || "",
 		hasAudio: o.hasAudio,
 		autoplayAudioEnabled: !!o.autoplayAudioEnabled,
@@ -5058,10 +5076,10 @@ var Io = ({ id: e, labelHtml: t, imageUrl: n, imageAlt: r }) => ({
 		mode: a.mode
 	};
 	if (a.mode === "evaluate") {
-		let e = jo(o, i);
-		c.correctness = e, c.responseCorrect = e === "correct", c.correctChoiceId = o.correctChoiceId;
+		let e = Io(o, i);
+		l.correctness = e, l.responseCorrect = e === "correct", l.correctChoiceId = o.correctChoiceId;
 	}
-	return a.role === "instructor" && (a.mode === "view" || a.mode === "evaluate") ? c.teacherInstructions = o.teacherInstructionsEnabled ? o.teacherInstructions : null : c.teacherInstructions = null, c;
+	return a.role === "instructor" && (a.mode === "view" || a.mode === "evaluate") ? l.teacherInstructions = o.teacherInstructionsEnabled ? o.teacherInstructions : null : l.teacherInstructions = null, l;
 }, Vo = (e, t) => new Promise((n) => {
 	t.mode !== "evaluate" && t.role === "instructor" ? n({
 		id: "1",