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

package/dist/controller/index.d.ts

@@ -1,8 +1,11 @@
-import type { McpbChoice, McpbQuestion, McpbSession, McpbEnv, McpbCorrectness } from '../shared/types';
+import type { PieUpdateSession } from '@pie-element/shared-types';
+import type { McpbChoice, McpbQuestion, McpbSession, McpbEnv, McpbCorrectness } from '../shared/types.js';
 export declare function countBlankTokens(template: string): number;
 export declare const getCorrectness: (question: McpbQuestion, session: McpbSession) => McpbCorrectness;
-export declare const getPartialScore: (_question: McpbQuestion, session: McpbSession) => 0 | 1;
+/** One blank, one key: an answered session scores 1 only when it picked the key. */
+export declare const getPartialScore: (question: McpbQuestion, session: McpbSession) => 1 | 0;
 export declare const outcome: (question: McpbQuestion, session: McpbSession, env: McpbEnv) => Promise<unknown>;
+/** The authoring starting point: a question that passes `validate()` as it stands. */
 export declare const createDefaultModel: (model?: McpbQuestion) => {
     layoutLimits: {
         blankStandaloneWidthRem: number;
@@ -26,7 +29,6 @@ export declare const createDefaultModel: (model?: McpbQuestion) => {
         audioBlankTemplateMarginTopRem: number;
         audioBlankTemplateMarginBottomRem: number;
         audioInstructionsMaxWidthPx: number;
-        narrowHorizontalChoiceMaxWidthPx: number;
         stimulusGridColumnGapRem: number;
         stimulusGridRowGapRem: number;
         stimulusSentenceMarginTopRem: number;
@@ -41,39 +43,44 @@ export declare const createDefaultModel: (model?: McpbQuestion) => {
         inlineTemplateMarginTopRem: number;
         inlineChoicesMarginTopRem: number;
     };
-    id: string;
-    element: string;
-    prompt: string;
-    promptEnabled: boolean;
-    interactionMode: import("../shared/types").McpbInteractionMode;
-    layoutProfile: string;
-    choiceLayout: string;
-    layoutProfilePresets: {};
-    audioButtonSkin: import("../shared/types").McpbAudioButtonSkin | null;
-    audioButtonSkinsByLocale: {};
-    uiText: import("../shared/types").McpbUiText;
-    sentenceHtml: string;
-    template: string;
-    choiceMode: import("../shared/types").McpbChoiceMode;
-    choices: McpbChoice[] | {
-        id: string;
-        labelHtml: string;
-    }[];
-    correctChoiceId: string;
-    hasAudio: boolean;
-    autoplayAudioEnabled: boolean;
-    completeAudioEnabled: boolean;
-    audioUrl: string;
-    audioTranscript: string;
+    id?: string;
+    element?: string;
+    prompt?: string;
+    promptEnabled?: boolean;
+    interactionMode?: import("../shared/types.js").McpbInteractionMode;
+    layoutProfile?: string;
+    choiceLayout?: string;
+    layoutProfilePresets?: Record<string, Partial<import("../shared/layoutLimits.js").LayoutLimits>>;
+    audioButtonSkin?: import("../shared/types.js").McpbAudioButtonSkin | null;
+    audioButtonSkinsByLocale?: Record<string, import("../shared/types.js").McpbAudioButtonSkin>;
+    sentenceHtml?: string;
+    template?: string;
+    choiceMode?: import("../shared/types.js").McpbChoiceMode;
+    choices?: McpbChoice[];
+    choiceGroupLabel?: string;
+    correctChoiceId?: string;
+    hasAudio?: boolean;
+    autoplayAudioEnabled?: boolean;
+    completeAudioEnabled?: boolean;
+    audioUrl?: string;
+    audioTranscript?: string;
     useFeatureButtonAudio?: boolean;
-    locale: string;
-    shuffle?: boolean;
+    locale?: string;
+    language?: string;
     lockChoiceOrder?: boolean;
-    teacherInstructions: string;
-    teacherInstructionsEnabled: boolean;
+    shuffle?: boolean;
+    teacherInstructions?: string;
+    teacherInstructionsEnabled?: boolean;
+    printAnswerKey?: boolean;
     customType?: string;
 };
+/**
+ * What `model()` and `outcome()` read: the item's own fields, with neutral
+ * values for the rest. Starter content here would reach a learner as the
+ * item's prompt or choices.
+ */
 export declare const normalize: (question?: McpbQuestion) => {
+    lockChoiceOrder: boolean;
     layoutLimits: {
         blankStandaloneWidthRem: number;
         blankWideWidthRem: number;
@@ -96,7 +103,6 @@ export declare const normalize: (question?: McpbQuestion) => {
         audioBlankTemplateMarginTopRem: number;
         audioBlankTemplateMarginBottomRem: number;
         audioInstructionsMaxWidthPx: number;
-        narrowHorizontalChoiceMaxWidthPx: number;
         stimulusGridColumnGapRem: number;
         stimulusGridRowGapRem: number;
         stimulusSentenceMarginTopRem: number;
@@ -111,43 +117,52 @@ export declare const normalize: (question?: McpbQuestion) => {
         inlineTemplateMarginTopRem: number;
         inlineChoicesMarginTopRem: number;
     };
-    id: string;
-    element: string;
-    prompt: string;
-    promptEnabled: boolean;
-    interactionMode: import("../shared/types").McpbInteractionMode;
-    layoutProfile: string;
-    choiceLayout: string;
-    layoutProfilePresets: {};
-    audioButtonSkin: import("../shared/types").McpbAudioButtonSkin | null;
-    audioButtonSkinsByLocale: {};
-    uiText: import("../shared/types").McpbUiText;
-    sentenceHtml: string;
-    template: string;
-    choiceMode: import("../shared/types").McpbChoiceMode;
-    choices: McpbChoice[] | {
-        id: string;
-        labelHtml: string;
-    }[];
-    correctChoiceId: string;
-    hasAudio: boolean;
-    autoplayAudioEnabled: boolean;
-    completeAudioEnabled: boolean;
-    audioUrl: string;
-    audioTranscript: string;
+    id?: string;
+    element?: string;
+    prompt?: string;
+    promptEnabled?: boolean;
+    interactionMode?: import("../shared/types.js").McpbInteractionMode;
+    layoutProfile?: string;
+    choiceLayout?: string;
+    layoutProfilePresets?: Record<string, Partial<import("../shared/layoutLimits.js").LayoutLimits>>;
+    audioButtonSkin?: import("../shared/types.js").McpbAudioButtonSkin | null;
+    audioButtonSkinsByLocale?: Record<string, import("../shared/types.js").McpbAudioButtonSkin>;
+    sentenceHtml?: string;
+    template?: string;
+    choiceMode?: import("../shared/types.js").McpbChoiceMode;
+    choices?: McpbChoice[];
+    choiceGroupLabel?: string;
+    correctChoiceId?: string;
+    hasAudio?: boolean;
+    autoplayAudioEnabled?: boolean;
+    completeAudioEnabled?: boolean;
+    audioUrl?: string;
+    audioTranscript?: string;
     useFeatureButtonAudio?: boolean;
-    locale: string;
+    locale?: string;
+    language?: string;
     shuffle?: boolean;
-    lockChoiceOrder?: boolean;
-    teacherInstructions: string;
-    teacherInstructionsEnabled: boolean;
+    teacherInstructions?: string;
+    teacherInstructionsEnabled?: boolean;
+    printAnswerKey?: boolean;
     customType?: string;
 };
 export declare const normalizeSession: (s: McpbSession) => McpbSession;
-type UpdateSessionFn = (id: string, element: string, data: {
-    shuffledValues: string[];
-}) => Promise<void>;
-export declare const model: (question: McpbQuestion, session: McpbSession | null, env: McpbEnv | null, updateSession?: UpdateSessionFn) => Promise<Record<string, unknown>>;
+export declare const model: (question: McpbQuestion, session: McpbSession | null, env: McpbEnv | null, updateSession?: PieUpdateSession) => Promise<Record<string, unknown>>;
 export declare const createCorrectResponseSession: (question: McpbQuestion, env: McpbEnv) => Promise<unknown>;
-export declare const validate: (question?: McpbQuestion, _config?: Record<string, unknown>) => Record<string, string>;
+type ValidateConfig = {
+    minAnswerChoices?: number;
+    maxAnswerChoices?: number;
+    prompt?: {
+        required?: boolean;
+    };
+    teacherInstructions?: {
+        required?: boolean;
+    };
+};
+/**
+ * Authoring errors in multiple-choice's shape: a message per field, and under
+ * `choices` a message per choice keyed by its id.
+ */
+export declare const validate: (question?: McpbQuestion, config?: ValidateConfig) => Record<string, string | Record<string, string>>;
 export {};

package/dist/controller/index.js

@@ -1,3 +1,39 @@
+//#region ../../shared/controller-utils/dist/index.js
+function n(e) {
+	return Array.isArray(e) ? e.filter((e) => e != null) : [];
+}
+function r(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 i(e) {
+	return e == null ? !0 : Array.isArray(e) ? e.length === 0 : typeof e == "object" && Object.keys(e).length === 0;
+}
+async function a(e, t, a, o = "value") {
+	let s = n(t?.data?.shuffledValues ?? t?.shuffledValues ?? []);
+	if (!t) {
+		console.warn("Unable to save shuffled choices because there's no session.");
+		return;
+	}
+	if (!i(s)) return n(s.map((t) => e.find((e) => e[o] === t)));
+	let c = r(e);
+	if (a && typeof a == "function") try {
+		let e = n(c.map((e) => e[o]));
+		i(e) ? console.error(`shuffledValues is an empty array - refusing to call updateSession. shuffledChoices: ${JSON.stringify(c)}, key: ${o}`) : await a(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 c;
+}
+function o(e, t, n) {
+	return !!(e.lockChoiceOrder || n?.["@pie-element"]?.lockChoiceOrder);
+}
+//#endregion
 //#region src/shared/layoutLimits.ts
 /** Baseline values tuned to match historical CQT visuals; override via model.layoutLimits. */
 var DEFAULT_LAYOUT_LIMITS = {
@@ -22,7 +58,6 @@ var DEFAULT_LAYOUT_LIMITS = {
 	audioBlankTemplateMarginTopRem: .8,
 	audioBlankTemplateMarginBottomRem: 1.8,
 	audioInstructionsMaxWidthPx: 875,
-	narrowHorizontalChoiceMaxWidthPx: 230,
 	stimulusGridColumnGapRem: 2,
 	stimulusGridRowGapRem: .7,
 	stimulusSentenceMarginTopRem: .2,
@@ -41,38 +76,44 @@ var DEFAULT_LAYOUT_LIMITS = {
 //#region src/controller/defaults.ts
 /** Token authors must include exactly once in `template` (HTML). */
 var BLANK_TOKEN = "{{blank}}";
+/**
+* The values `normalize` fills in for fields an item leaves out. They carry no
+* content and no `id` or `element`: those come from the item config, and a
+* default here would stand in for a field the author never set.
+*/
+var defaults_default$1 = { model: {
+	prompt: "",
+	promptEnabled: true,
+	interactionMode: "populate_blank",
+	layoutProfile: "",
+	choiceLayout: "",
+	layoutProfilePresets: {},
+	layoutLimits: { ...DEFAULT_LAYOUT_LIMITS },
+	audioButtonSkin: null,
+	audioButtonSkinsByLocale: {},
+	sentenceHtml: "",
+	template: "",
+	choiceMode: "text",
+	choices: [],
+	choiceGroupLabel: "",
+	correctChoiceId: "",
+	hasAudio: false,
+	autoplayAudioEnabled: false,
+	completeAudioEnabled: false,
+	audioUrl: "",
+	audioTranscript: "",
+	locale: "",
+	teacherInstructions: "",
+	teacherInstructionsEnabled: true
+} };
+//#endregion
+//#region src/author/defaults.ts
+/** The model a new item starts from: a valid question an author edits in place. */
 var defaults_default = {
 	model: {
-		id: "1",
-		element: "mc-populated-blank",
+		...defaults_default$1.model,
 		prompt: "<p><strong>Demo prompt</strong></p>",
-		promptEnabled: true,
-		interactionMode: "populate_blank",
-		layoutProfile: "",
-		choiceLayout: "",
-		layoutProfilePresets: {},
-		layoutLimits: { ...DEFAULT_LAYOUT_LIMITS },
-		audioButtonSkin: null,
-		audioButtonSkinsByLocale: {},
-		uiText: {
-			answerChoices: "Answer choices",
-			selectedAnswerInSentence: "blank",
-			blankPreSelectionHint: "The answer you choose will appear on the blank line above.",
-			showCorrectAnswer: "Show correct answer",
-			hideCorrectAnswer: "Hide correct answer",
-			clickToEnableAutoplay: "Click to enable audio autoplay",
-			audioResourceUnavailable: "Audio is enabled but no playable audio URL is configured.",
-			transcriptLabel: "Transcript",
-			listenLabelEn: "Listen",
-			listenLabelEs: "Escuchar",
-			listenSilentAlt: "Repeat instructions",
-			listenPlayingAlt: "Instructions are playing",
-			listenSilentAltEs: "Escuchar. Repetir las instrucciones.",
-			listenPlayingAltEs: "Escuchar. Estas son las instrucciones."
-		},
-		sentenceHtml: "",
 		template: `<p>The answer is ${BLANK_TOKEN}.</p>`,
-		choiceMode: "text",
 		choices: [
 			{
 				id: "c1",
@@ -87,15 +128,7 @@ var defaults_default = {
 				labelHtml: "<p>Option C</p>"
 			}
 		],
-		correctChoiceId: "c2",
-		hasAudio: false,
-		autoplayAudioEnabled: false,
-		completeAudioEnabled: false,
-		audioUrl: "",
-		audioTranscript: "",
-		locale: "",
-		teacherInstructions: "",
-		teacherInstructionsEnabled: false
+		correctChoiceId: "c2"
 	},
 	configuration: { prompt: {
 		label: "Prompt",
@@ -115,10 +148,8 @@ var getCorrectness = (question, session) => {
 	if (session.choiceId === correct) return "correct";
 	return "incorrect";
 };
-var getPartialScore = (_question, session) => {
-	if (!session || isEmptyObject(session) || !session.choiceId) return 0;
-	return 1;
-};
+/** One blank, one key: an answered session scores 1 only when it picked the key. */
+var getPartialScore = (question, session) => getCorrectness(question, session) === "correct" ? 1 : 0;
 var outcome = (question, session, env) => new Promise((resolve) => {
 	if (!session || isEmptyObject(session)) {
 		resolve({
@@ -129,8 +160,8 @@ var outcome = (question, session, env) => new Promise((resolve) => {
 		return;
 	}
 	session = normalizeSession(session);
-	const correctness = getCorrectness(question, session);
-	if (correctness === "unanswered") {
+	const normalizedQuestion = normalize(question);
+	if (getCorrectness(normalizedQuestion, session) === "unanswered") {
 		resolve({
 			score: 0,
 			empty: true,
@@ -138,68 +169,58 @@ var outcome = (question, session, env) => new Promise((resolve) => {
 		});
 		return;
 	}
-	const score = correctness === "correct" ? 1 : 0;
+	const score = getPartialScore(normalizedQuestion, session);
 	resolve({
 		score,
 		empty: false,
 		traceLog: [
 			`Mode: ${env?.mode || "unknown"}.`,
 			`Student selected choice: ${session.choiceId}.`,
-			`Correct choice: ${question?.correctChoiceId || "none"}.`,
+			`Correct choice: ${normalizedQuestion.correctChoiceId || "none"}.`,
 			`Final score: ${score}.`
 		]
 	});
 });
-var createDefaultModel = (model = {}) => ({
-	...defaults_default.model,
+var withDefaults = (base, model = {}) => ({
+	...base,
 	...model,
 	layoutLimits: {
 		...DEFAULT_LAYOUT_LIMITS,
 		...model?.layoutLimits || {}
 	}
 });
-var normalize = (question = {}) => createDefaultModel(question);
-var normalizeSession = (s) => ({ ...s });
-var shouldShuffleChoices = (question) => !!question?.shuffle;
-var shouldLockChoices = (question, env) => {
-	if (question?.lockChoiceOrder) return true;
-	if (env?.["@pie-element"]?.lockChoiceOrder) return true;
-	return env?.role === "instructor";
-};
-function shuffleArray(items) {
-	const out = [...items];
-	for (let i = out.length - 1; i > 0; i--) {
-		const j = Math.floor(Math.random() * (i + 1));
-		[out[i], out[j]] = [out[j], out[i]];
-	}
-	return out;
-}
-var getStoredShuffle = (session) => Array.isArray(session?.data?.shuffledValues) ? session.data.shuffledValues : Array.isArray(session?.shuffledValues) ? session.shuffledValues : [];
-var applyShuffledValues = (choices, shuffledValues, choiceKey) => {
-	const orderedChoices = shuffledValues.map((value) => choices.find((choice) => choice?.[choiceKey] === value)).filter((c) => !!c);
-	if (orderedChoices.length === choices.length) return orderedChoices;
-	const orderedValues = new Set(orderedChoices.map((choice) => choice[choiceKey]));
-	const leftovers = choices.filter((choice) => !orderedValues.has(choice?.[choiceKey]));
-	return [...orderedChoices, ...leftovers];
-};
-var getOrderedChoices = async (question, session, env, updateSession) => {
-	const choices = Array.isArray(question?.choices) ? [...question.choices] : [];
-	if (!choices.length || !shouldShuffleChoices(question)) return choices;
-	if (shouldLockChoices(question, env || {})) return choices;
-	const shuffledValues = getStoredShuffle(session);
-	if (shuffledValues.length) return applyShuffledValues(choices, shuffledValues, "id");
-	const shuffledChoices = shuffleArray(choices);
-	if (updateSession && typeof updateSession === "function" && session?.id && session?.element) {
-		const shuffledIds = shuffledChoices.map((choice) => choice?.id).filter(Boolean);
-		if (shuffledIds.length) await updateSession(session.id, session.element, { shuffledValues: shuffledIds });
-	}
-	return shuffledChoices;
+/** The authoring starting point: a question that passes `validate()` as it stands. */
+var createDefaultModel = (model = {}) => withDefaults(defaults_default.model, model);
+/**
+* What `model()` and `outcome()` read: the item's own fields, with neutral
+* values for the rest. Starter content here would reach a learner as the
+* item's prompt or choices.
+*/
+var normalize = (question = {}) => {
+	const { shuffle, ...rest } = question || {};
+	return {
+		...withDefaults(defaults_default$1.model, rest),
+		lockChoiceOrder: typeof rest.lockChoiceOrder === "boolean" ? rest.lockChoiceOrder : shuffle !== true
+	};
 };
+var normalizeSession = (s) => ({ ...s });
+/**
+* The fields delivery renders. An imported choice can carry more, such as a
+* correctness flag or feedback, which must not reach a learner's browser.
+*/
+var toDeliveryChoice = ({ id, labelHtml, imageUrl, imageAlt }) => ({
+	id,
+	...labelHtml !== void 0 ? { labelHtml } : {},
+	...imageUrl !== void 0 ? { imageUrl } : {},
+	...imageAlt !== void 0 ? { imageAlt } : {}
+});
 var model = async (question, session, env, updateSession) => {
 	const safeSession = session || {};
 	const safeEnv = env || {};
 	const normalizedQuestion = normalize(question);
-	const choices = await getOrderedChoices(normalizedQuestion, safeSession, safeEnv, updateSession);
+	let orderedChoices = Array.isArray(normalizedQuestion.choices) ? [...normalizedQuestion.choices] : [];
+	if (orderedChoices.length && !o(normalizedQuestion, safeSession, safeEnv)) orderedChoices = await a(orderedChoices, safeSession, updateSession, "id") ?? orderedChoices;
+	const choices = orderedChoices.filter((c) => !!c && typeof c === "object").map(toDeliveryChoice);
 	const out = {
 		prompt: normalizedQuestion.promptEnabled ? normalizedQuestion.prompt : null,
 		interactionMode: normalizedQuestion.interactionMode || "populate_blank",
@@ -209,11 +230,11 @@ var model = async (question, session, env, updateSession) => {
 		layoutLimits: normalizedQuestion.layoutLimits || { ...DEFAULT_LAYOUT_LIMITS },
 		audioButtonSkin: normalizedQuestion.audioButtonSkin && typeof normalizedQuestion.audioButtonSkin === "object" ? normalizedQuestion.audioButtonSkin : null,
 		audioButtonSkinsByLocale: normalizedQuestion.audioButtonSkinsByLocale && typeof normalizedQuestion.audioButtonSkinsByLocale === "object" ? normalizedQuestion.audioButtonSkinsByLocale : {},
-		uiText: normalizedQuestion.uiText && typeof normalizedQuestion.uiText === "object" ? normalizedQuestion.uiText : {},
 		sentenceHtml: normalizedQuestion.sentenceHtml || null,
 		template: normalizedQuestion.template,
 		choiceMode: normalizedQuestion.choiceMode,
 		choices,
+		choiceGroupLabel: normalizedQuestion.choiceGroupLabel || "",
 		hasAudio: normalizedQuestion.hasAudio,
 		autoplayAudioEnabled: !!normalizedQuestion.autoplayAudioEnabled,
 		completeAudioEnabled: !!normalizedQuestion.completeAudioEnabled,
@@ -222,6 +243,7 @@ var model = async (question, session, env, updateSession) => {
 		customType: normalizedQuestion.customType || "",
 		useFeatureButtonAudio: typeof normalizedQuestion.useFeatureButtonAudio === "boolean" ? normalizedQuestion.useFeatureButtonAudio : void 0,
 		locale: normalizedQuestion.locale || "",
+		language: normalizedQuestion.language || normalizedQuestion.locale || void 0,
 		disabled: safeEnv.mode !== "gather",
 		mode: safeEnv.mode
 	};
@@ -239,18 +261,22 @@ var createCorrectResponseSession = (question, env) => {
 	return new Promise((resolve) => {
 		if (env.mode !== "evaluate" && env.role === "instructor") resolve({
 			id: "1",
-			element: "mc-populated-blank",
 			choiceId: question?.correctChoiceId || ""
 		});
 		else resolve(null);
 	});
 };
-var validate = (question = {}, _config = {}) => {
+/** Markup with its tags removed, keeping media an author can answer from. */
+var getContent = (html) => (html || "").replace(/(<(?!img|iframe|source)([^>]+)>)/gi, "").trim();
+/**
+* Authoring errors in multiple-choice's shape: a message per field, and under
+* `choices` a message per choice keyed by its id.
+*/
+var validate = (question = {}, config = {}) => {
 	const errors = {};
-	if (question.promptEnabled) {
-		const p = question.prompt?.trim() || "";
-		if (!p || p === "<p></p>") errors.prompt = "Prompt is required when prompt is enabled";
-	}
+	const { minAnswerChoices = 2, maxAnswerChoices } = config;
+	if ((question.promptEnabled || config.prompt?.required) && !getContent(question.prompt)) errors.prompt = "This field is required.";
+	if (config.teacherInstructions?.required && !getContent(question.teacherInstructions)) errors.teacherInstructions = "This field is required.";
 	const interactionMode = question.interactionMode || "populate_blank";
 	const n = countBlankTokens(question.template || "");
 	if (interactionMode === "audio_mc_only") {
@@ -260,33 +286,35 @@ var validate = (question = {}, _config = {}) => {
 		else if (n > 1) errors.template = `Template must contain only one ${BLANK_TOKEN} placeholder`;
 	} else errors.interactionMode = "Unknown interaction mode";
 	const choices = Array.isArray(question.choices) ? question.choices : [];
-	if (choices.length < 2) errors.choices = "At least two choices are required";
+	if (choices.length < minAnswerChoices) errors.answerChoices = `There should be at least ${minAnswerChoices} choices defined.`;
+	else if (maxAnswerChoices != null && choices.length > maxAnswerChoices) errors.answerChoices = `No more than ${maxAnswerChoices} choices should be defined.`;
 	const mode = question.choiceMode || "text";
-	for (let i = 0; i < choices.length; i++) {
-		const c = choices[i];
+	const choicesErrors = {};
+	const seenIds = /* @__PURE__ */ new Set();
+	const seenLabels = /* @__PURE__ */ new Set();
+	choices.forEach((c, i) => {
+		const key = c?.id || String(i);
 		if (!c?.id) {
-			errors.choices = `Choice ${i + 1} is missing an id`;
-			break;
+			choicesErrors[key] = "Choice needs an id.";
+			return;
 		}
-		if (mode === "text") {
-			const lbl = (c.labelHtml || "").trim();
-			if (!lbl || lbl === "<p></p>") {
-				errors.choices = `Choice ${i + 1} needs label text`;
-				break;
-			}
-		} else {
-			if (!c.imageUrl?.trim()) {
-				errors.choices = `Choice ${i + 1} needs an image URL`;
-				break;
-			}
-			if (!c.imageAlt?.trim()) {
-				errors.choices = `Choice ${i + 1} needs image alt text`;
-				break;
-			}
+		if (seenIds.has(c.id)) {
+			choicesErrors[key] = "Choice id should be unique.";
+			return;
 		}
-	}
+		seenIds.add(c.id);
+		if (mode === "text") {
+			const label = getContent(c.labelHtml);
+			if (!label) choicesErrors[key] = "Content should not be empty.";
+			else if (seenLabels.has(label)) choicesErrors[key] = "Content should be unique.";
+			seenLabels.add(label);
+		} else if (!c.imageUrl?.trim()) choicesErrors[key] = "An image is required.";
+		else if (!c.imageAlt?.trim()) choicesErrors[key] = "Image alt text is required.";
+	});
+	if (Object.keys(choicesErrors).length) errors.choices = choicesErrors;
 	const correct = question.correctChoiceId;
-	if (!correct || !choices.some((c) => c.id === correct)) errors.correctChoiceId = "Correct choice must match one of the choice ids";
+	if (!correct) errors.correctResponse = "No correct response defined.";
+	else if (!choices.some((c) => c?.id === correct)) errors.correctResponse = "The correct response must be one of the choices.";
 	if (question.hasAudio) {
 		if (!!!question.audioUrl?.trim()) errors.audioUrl = "A playable audio URL is required when audio is enabled";
 	}
@@ -313,7 +341,6 @@ var validate = (question = {}, _config = {}) => {
 		"audioBlankTemplateMarginTopRem",
 		"audioBlankTemplateMarginBottomRem",
 		"audioInstructionsMaxWidthPx",
-		"narrowHorizontalChoiceMaxWidthPx",
 		"stimulusGridColumnGapRem",
 		"stimulusGridRowGapRem",
 		"stimulusSentenceMarginTopRem",