@tinyweb_dev/oe-exam-sdk 1.0.8 → 1.0.10

package/dist/components/questions/viewer/QuestionViewer.js

@@ -38,7 +38,7 @@ import { MatchWordToPictureViewer } from './MatchWordToPictureViewer';
 import { MatchWordToPictureGroupViewer } from './MatchWordToPictureGroupViewer';
 import { MatchColumnsToMakeSentencesViewer } from './MatchColumnsToMakeSentencesViewer';
 import { WordOrderingGroupViewer } from './WordOrderingGroupViewer';
-export function QuestionViewer({ question, onSubmitAnswer, isReviewMode = false, userAnswer, }) {
+export function QuestionViewer({ question, onSubmitAnswer, isReviewMode = false, userAnswer, gradeDetails, }) {
     const [selectedAnswer, setSelectedAnswer] = useState(userAnswer || null);
     const [playCount, setPlayCount] = useState(0);
     const audioRef = useRef(null);
@@ -477,6 +477,19 @@ export function QuestionViewer({ question, onSubmitAnswer, isReviewMode = false,
         }
         return (_jsxs("div", { className: "space-y-3", children: [content.title ? _jsx("h3", { className: "text-center text-lg font-bold uppercase text-slate-800", children: content.title }) : null, content.imageUrl ? (_jsx("div", { className: "flex justify-center", children: _jsx("img", { src: String(content.imageUrl), alt: "", className: "max-h-[180px] rounded-lg object-contain" }) })) : null, _jsx("div", { className: "space-y-2 text-base leading-relaxed text-slate-800", children: paragraph.split('\n').map((line, li) => (_jsx("div", { className: "flex flex-wrap items-baseline", children: renderLine(line, `wfp-${li}`) }, `wfp-l${li}`))) }), isReviewMode && correctAnswers.length > 0 ? (_jsxs("div", { className: "rounded-lg border border-emerald-200 bg-emerald-50/80 p-2.5 text-sm text-emerald-800", children: [_jsx("span", { className: "font-semibold", children: "\u0110\u00E1p \u00E1n: " }), correctAnswers.map((a, i) => (_jsxs("span", { className: "mr-2", children: ["(", i + 1, ") ", _jsx("span", { className: "font-bold underline", children: a || '—' })] }, `wfp-a${i}`)))] })) : null] }));
     };
+    const renderCrosswordPuzzle = () => {
+        const raw = userAnswer && typeof userAnswer === 'object' && !Array.isArray(userAnswer)
+            ? userAnswer
+            : {};
+        const answers = raw.answers && typeof raw.answers === 'object' && !Array.isArray(raw.answers)
+            ? raw.answers
+            : raw;
+        return (_jsx(CrosswordPuzzleClient, { content: question.content, correctAnswer: question.correctAnswer ?? question.answer, isReviewMode: isReviewMode, questionNumber: question.questionNumber, userAnswers: answers, onAnswerChange: isReviewMode
+                ? undefined
+                : (key, value) => {
+                    onSubmitAnswer?.({ answers: { ...answers, [key]: value } });
+                } }));
+    };
     const renderQuestion = () => {
         const resolvedType = String(question.type ||
             question.questionType ||
@@ -488,9 +501,9 @@ export function QuestionViewer({ question, onSubmitAnswer, isReviewMode = false,
             case 'CHOOSE_THE_CORRECT_ANSWER_GROUP':
                 return (_jsx(ChooseTheCorrectAnswerGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'TRUE_FALSE_GROUP':
-                return (_jsx(TrueFalseGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer }));
+                return (_jsx(TrueFalseGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'TRUE_FALSE_CORRECT_GROUP':
-                return (_jsx(TrueFalseCorrectGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer }));
+                return (_jsx(TrueFalseCorrectGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'FILL_IN_BLANK_GROUP':
                 return (_jsx(FillInBlankGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'MATCHING_WITH_LINES_GROUP':
@@ -498,20 +511,20 @@ export function QuestionViewer({ question, onSubmitAnswer, isReviewMode = false,
             case 'MATCH_COLUMNS_TO_MAKE_SENTENCES':
                 return (_jsx(MatchColumnsToMakeSentencesViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'CROSS_OUT_WORD_GROUP':
-                return (_jsx(CrossOutWordGroupViewer, { question: question, isReviewMode: isReviewMode }));
+                return (_jsx(CrossOutWordGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'ANSWER_THE_QUESTION':
                 return (_jsx(AnswerTheQuestionViewer, { question: question, isReviewMode: isReviewMode, userAnswer: typeof userAnswer === 'string' ? userAnswer : undefined, onSubmitAnswer: onSubmitAnswer }));
             case 'ANSWER_THE_QUESTION_GROUP':
-                return (_jsx(AnswerTheQuestionGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer }));
+                return (_jsx(AnswerTheQuestionGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'SPEAKING_CUE_CARD':
                 return (_jsx(SpeakingCueCardClient, { questionData: mapQuestionToSpeakingCueCardData(question), isReviewMode: isReviewMode }));
             case 'SPONTANEOUS_QA':
                 return (_jsx(SpontaneousQAClient, { questionData: mapQuestionToSpontaneousQAData(question), isReviewMode: isReviewMode }));
             case 'SPONTANEOUS_QA_GROUP':
-                return (_jsx(SpontaneousQaGroupViewer, { question: question, isReviewMode: isReviewMode }));
+                return (_jsx(SpontaneousQaGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, gradeDetails: gradeDetails, disabled: !onSubmitAnswer }));
             case 'WORD_ORDER_AND_MATCH_GROUP':
             case 'WORD_ORDER_AND_MATCH':
-                return (_jsx(WordOrderAndMatchGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer }));
+                return (_jsx(WordOrderAndMatchGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'WORD_ORDERING_GROUP':
                 return (_jsx(WordOrderingGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'MATCH_WORD_TO_PICTURE_GROUP':
@@ -551,13 +564,13 @@ export function QuestionViewer({ question, onSubmitAnswer, isReviewMode = false,
             case 'WORD_FILL_STRUCTURED_FORM':
                 return (_jsx(WordFillStructuredFormViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'CROSSWORD_PUZZLE':
-                return (_jsx(CrosswordPuzzleClient, { content: question.content, correctAnswer: question.answer, isReviewMode: isReviewMode, userAnswers: userAnswer }));
+                return renderCrosswordPuzzle();
             case 'FIND_WORDS_IN_MATRIX':
-                return (_jsx(FindWordsInMatrixClient, { content: question.content, correctAnswer: question.answer, showSolution: isReviewMode }));
+                return (_jsx(FindWordsInMatrixClient, { content: question.content, correctAnswer: question.correctAnswer ?? question.answer, showSolution: isReviewMode, userAnswer: userAnswer, onAnswerChange: isReviewMode ? undefined : onSubmitAnswer }));
             case 'SORT_WORDS_INTO_CATEGORIES':
                 return (_jsx(SortWordsIntoCategoriesViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'CHOOSE_THEN_ANSWER_GROUP':
-                return (_jsx(ChooseThenAnswerGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
+                return (_jsx(ChooseThenAnswerGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, gradeDetails: gradeDetails, onSubmitAnswer: onSubmitAnswer }));
             default:
                 return _jsxs("div", { children: ["Lo\u1EA1i c\u00E2u h\u1ECFi kh\u00F4ng \u0111\u01B0\u1EE3c h\u1ED7 tr\u1EE3: ", question.type] });
         }

package/dist/components/questions/viewer/SpontaneousQaGroupViewer.d.ts

@@ -1,5 +1,11 @@
 import type { Question } from '../../../shared/types/entities/question.types';
-export declare function SpontaneousQaGroupViewer({ question, isReviewMode, }: {
+import type { SpontaneousQaGroupGradeDetail } from '../_shared/types/spontaneous-qa-group.type';
+export declare function SpontaneousQaGroupViewer({ question, isReviewMode, userAnswer, onItemRecorded, uploadingIndex, gradeDetails, disabled, }: {
     question: Question;
     isReviewMode?: boolean;
+    userAnswer?: unknown;
+    onItemRecorded?: (flattenIndex: number, blob: Blob) => void;
+    uploadingIndex?: number | null;
+    gradeDetails?: SpontaneousQaGroupGradeDetail[];
+    disabled?: boolean;
 }): import("react").JSX.Element;

package/dist/components/questions/viewer/SpontaneousQaGroupViewer.js

@@ -2,6 +2,18 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { SpontaneousQaGroupClient } from '../types/spontaneous-qa-group/SpontaneousQaGroupClient';
 import { mapQuestionToSpontaneousQaGroupData } from '../types/spontaneous-qa-group/map-spontaneous-qa-group-data';
-export function SpontaneousQaGroupViewer({ question, isReviewMode = false, }) {
-    return (_jsx(SpontaneousQaGroupClient, { questionData: mapQuestionToSpontaneousQaGroupData(question), isReviewMode: isReviewMode }));
+function readStudentAnswer(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value)) {
+        return undefined;
+    }
+    const keys = value.audioKeys;
+    if (!Array.isArray(keys)) {
+        return undefined;
+    }
+    return {
+        audioKeys: keys.map((key) => (typeof key === 'string' && key.trim() !== '' ? key : null)),
+    };
+}
+export function SpontaneousQaGroupViewer({ question, isReviewMode = false, userAnswer, onItemRecorded, uploadingIndex, gradeDetails, disabled, }) {
+    return (_jsx(SpontaneousQaGroupClient, { questionData: mapQuestionToSpontaneousQaGroupData(question), isReviewMode: isReviewMode, userAnswer: readStudentAnswer(userAnswer), onItemRecorded: isReviewMode ? undefined : onItemRecorded, uploadingIndex: uploadingIndex, gradeDetails: isReviewMode ? undefined : gradeDetails, disabled: disabled }));
 }

package/dist/components/questions/viewer/TrueFalseCorrectGroupViewer.d.ts

@@ -3,7 +3,8 @@ import type { TrueFalseCorrectStudentItemAnswer } from '../_shared/types/true-fa
 type TrueFalseCorrectGroupViewerProps = {
     question: Question;
     isReviewMode?: boolean;
-    userAnswer?: TrueFalseCorrectStudentItemAnswer[];
+    userAnswer?: unknown;
+    onSubmitAnswer?: (answer: TrueFalseCorrectStudentItemAnswer[]) => void;
 };
-export declare function TrueFalseCorrectGroupViewer({ question, isReviewMode, userAnswer, }: TrueFalseCorrectGroupViewerProps): import("react").JSX.Element;
+export declare function TrueFalseCorrectGroupViewer({ question, isReviewMode, userAnswer, onSubmitAnswer, }: TrueFalseCorrectGroupViewerProps): import("react").JSX.Element;
 export {};

package/dist/components/questions/viewer/TrueFalseCorrectGroupViewer.js

@@ -2,13 +2,23 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { TrueFalseCorrectGroupClient } from '../types/true-false-correct-group/TrueFalseCorrectGroupClient';
 import { mapQuestionToTrueFalseCorrectGroupData } from '../types/true-false-correct-group/map-true-false-correct-group-data';
-export function TrueFalseCorrectGroupViewer({ question, isReviewMode = false, userAnswer, }) {
+function readStudentAnswers(value) {
+    if (Array.isArray(value)) {
+        return value;
+    }
+    if (value && typeof value === 'object' && Array.isArray(value.answer)) {
+        return value.answer;
+    }
+    return undefined;
+}
+export function TrueFalseCorrectGroupViewer({ question, isReviewMode = false, userAnswer, onSubmitAnswer, }) {
     const questionData = mapQuestionToTrueFalseCorrectGroupData(question);
-    const reviewAnswers = isReviewMode && !userAnswer
+    const storedAnswers = readStudentAnswers(userAnswer);
+    const reviewAnswers = isReviewMode && !storedAnswers
         ? questionData.items.map((item) => ({
             isTrue: item.isTrue,
             correction: item.correction,
         }))
-        : userAnswer;
-    return (_jsx(TrueFalseCorrectGroupClient, { questionData: questionData, isReviewMode: isReviewMode, userAnswers: reviewAnswers }));
+        : storedAnswers;
+    return (_jsx(TrueFalseCorrectGroupClient, { questionData: questionData, isReviewMode: isReviewMode, userAnswers: reviewAnswers, onAnswerChange: isReviewMode ? undefined : onSubmitAnswer }));
 }

package/dist/components/questions/viewer/TrueFalseGroupViewer.d.ts

@@ -2,7 +2,10 @@ import type { Question } from '../../../shared/types/entities/question.types';
 type TrueFalseGroupViewerProps = {
     question: Question;
     isReviewMode?: boolean;
-    userAnswer?: boolean[];
+    userAnswer?: boolean[] | {
+        answer?: boolean[];
+    };
+    onSubmitAnswer?: (answer: boolean[]) => void;
 };
-export declare function TrueFalseGroupViewer({ question, isReviewMode, userAnswer, }: TrueFalseGroupViewerProps): import("react").JSX.Element;
+export declare function TrueFalseGroupViewer({ question, isReviewMode, userAnswer, onSubmitAnswer, }: TrueFalseGroupViewerProps): import("react").JSX.Element;
 export {};

package/dist/components/questions/viewer/TrueFalseGroupViewer.js

@@ -2,10 +2,20 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { TrueFalseGroupClient } from '../types/true-false-group/TrueFalseGroupClient';
 import { mapQuestionToTrueFalseGroupData } from '../types/true-false-group/map-true-false-group-data';
-export function TrueFalseGroupViewer({ question, isReviewMode = false, userAnswer, }) {
+function readBooleanAnswers(value) {
+    if (Array.isArray(value)) {
+        return value;
+    }
+    if (value && typeof value === 'object' && Array.isArray(value.answer)) {
+        return value.answer;
+    }
+    return undefined;
+}
+export function TrueFalseGroupViewer({ question, isReviewMode = false, userAnswer, onSubmitAnswer, }) {
     const questionData = mapQuestionToTrueFalseGroupData(question);
-    const reviewAnswers = isReviewMode && !userAnswer
+    const storedAnswers = readBooleanAnswers(userAnswer);
+    const reviewAnswers = isReviewMode && !storedAnswers
         ? questionData.items.map((item) => item.correctAnswer)
-        : userAnswer;
-    return (_jsx(TrueFalseGroupClient, { questionData: questionData, isReviewMode: isReviewMode, userAnswers: reviewAnswers }));
+        : storedAnswers;
+    return (_jsx(TrueFalseGroupClient, { questionData: questionData, isReviewMode: isReviewMode, userAnswers: reviewAnswers, onAnswerChange: isReviewMode ? undefined : onSubmitAnswer }));
 }

package/dist/components/questions/viewer/WordOrderAndMatchGroupViewer.d.ts

@@ -1,6 +1,10 @@
 import type { Question } from '../../../shared/types/entities/question.types';
-export declare function WordOrderAndMatchGroupViewer({ question, isReviewMode, userAnswer, }: {
+export declare function WordOrderAndMatchGroupViewer({ question, isReviewMode, userAnswer, onSubmitAnswer, }: {
     question: Question;
     isReviewMode?: boolean;
-    userAnswer?: any;
+    userAnswer?: unknown;
+    onSubmitAnswer?: (answer: Array<{
+        orderedPhrase: string;
+        matchLabel: string;
+    }>) => void;
 }): import("react").JSX.Element;

package/dist/components/questions/viewer/WordOrderAndMatchGroupViewer.js

@@ -76,20 +76,40 @@ function resolveGroup(question) {
         items: itemsRaw.map((item, idx) => mapItem(item, idx, answersRaw[idx])),
     };
 }
-export function WordOrderAndMatchGroupViewer({ question, isReviewMode = false, userAnswer, }) {
+function readMatchAnswers(value) {
+    if (Array.isArray(value)) {
+        return value;
+    }
+    if (value && typeof value === 'object' && Array.isArray(value.answer)) {
+        return value.answer;
+    }
+    return undefined;
+}
+export function WordOrderAndMatchGroupViewer({ question, isReviewMode = false, userAnswer, onSubmitAnswer, }) {
     const { instruction, matchOptions, items } = resolveGroup(question);
     const questionData = {
         instruction,
         matchOptions,
         items,
     };
-    const autoUserAnswers = isReviewMode
+    const storedAnswers = readMatchAnswers(userAnswer);
+    const autoUserAnswers = isReviewMode && !storedAnswers
         ? items.map((item) => ({
             orderedPhrase: item.orderedPhrase,
             matchLabel: item.matchLabel,
         }))
-        : Array.isArray(userAnswer)
-            ? userAnswer
-            : undefined;
-    return (_jsx(WordOrderAndMatchGroupClient, { questionData: questionData, isReviewMode: isReviewMode, userAnswers: autoUserAnswers }));
+        : storedAnswers;
+    return (_jsx(WordOrderAndMatchGroupClient, { questionData: questionData, isReviewMode: isReviewMode, userAnswers: autoUserAnswers, onAnswerChange: isReviewMode
+            ? undefined
+            : (itemIndex, next) => {
+                const current = items.map((_, index) => {
+                    const existing = storedAnswers?.[index];
+                    return {
+                        orderedPhrase: existing?.orderedPhrase || '',
+                        matchLabel: existing?.matchLabel || '',
+                    };
+                });
+                current[itemIndex] = next;
+                onSubmitAnswer?.(current);
+            } }));
 }

package/dist/components/results/renderers/ReviewAnswerTheQuestionGroupRenderer.js

@@ -31,6 +31,6 @@ export function ReviewAnswerTheQuestionGroupRenderer({ partNumber, partName, que
                                             ? 'border-red-200 bg-red-50 text-red-800'
                                             : 'border-gray-200 bg-gray-50 text-gray-700'}`, children: question.isExample
                                         ? (question.exampleAnswer || '(Câu mẫu)')
-                                        : (studentAnswer || '(Chưa trả lời)') }), expectedAnswers.length > 0 && (_jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-xs font-medium text-gray-500", children: "\u0110\u00E1p \u00E1n m\u1EABu (AI)" }), _jsx("ul", { className: "list-disc space-y-1 pl-5 text-sm text-gray-700", children: expectedAnswers.map((answer) => (_jsx("li", { children: answer }, answer))) })] })), feedback && (_jsx("p", { className: "text-xs text-violet-700", children: feedback }))] })] }, question.id));
+                                        : (studentAnswer || '(Chưa trả lời)') }), expectedAnswers.length > 0 && (_jsxs("div", { className: "space-y-1", children: [_jsx("p", { className: "text-xs font-medium text-gray-500", children: "\u0110\u00E1p \u00E1n" }), _jsx("ul", { className: "list-disc space-y-1 pl-5 text-sm text-gray-700", children: expectedAnswers.map((answer) => (_jsx("li", { children: answer }, answer))) })] })), feedback && (_jsx("p", { className: "text-xs text-violet-700", children: feedback }))] })] }, question.id));
             })] }));
 }

package/dist/components/results/renderers/review-question-body-movers.js

@@ -218,7 +218,7 @@ export function renderMoversReviewBody(ctx) {
         case 'CROSSWORD_PUZZLE': {
             const data = transformCrosswordPuzzle(apiQuestions);
             const firstQuestion = apiQuestions[0];
-            return (_jsx(MoversCrosswordPuzzleRenderer, { partNumber: partNo, partName: part.name, instruction: part.instructions || data.instruction, questionCount: questionCount, title: data.title, gridSize: data.gridSize, clues: data.clues, answers: answers, correctAnswers: data.correctAnswers, onAnswerChange: handleAnswerChange, isReviewMode: true, caseSensitive: firstQuestion?.correct_answer?.caseSensitive || false }));
+            return (_jsx(MoversCrosswordPuzzleRenderer, { partNumber: partNo, partName: part.name, instruction: part.instructions || data.instruction, questionCount: questionCount, title: data.title, gridSize: data.gridSize, markedColumn: data.markedColumn, hiddenWord: data.hiddenWord, clues: data.clues, answers: answers, correctAnswers: data.correctAnswers, onAnswerChange: handleAnswerChange, isReviewMode: true, caseSensitive: data.caseSensitive || firstQuestion?.correct_answer?.caseSensitive || false }));
         }
         default:
             return null;

package/dist/components/results/review-data.js

@@ -140,13 +140,20 @@ function addCorrectAnswerMaps(result, answer) {
         texts.forEach((text, index) => { result.correctAnswerTextMap[`${answer.questionId}-blank-${index}`] = text; });
     if (answer.questionType === 'LABEL_THE_PICTURE' && isRecord(correct.labels))
         Object.entries(correct.labels).forEach(([id, value]) => { result.correctAnswerTextMap[id] = String(value); });
-    if ((answer.questionType === 'FILL_MISSING_WORDS_IN_GRID' || answer.questionType === 'CROSSWORD_PUZZLE') && isRecord(correct.cells || correct.answers)) {
+    if (answer.questionType === 'FILL_MISSING_WORDS_IN_GRID' && isRecord(correct.cells || correct.answers)) {
         const rawCells = (correct.cells || correct.answers);
         result.cellAnswersMap[answer.questionId] = {
             cells: Object.fromEntries(Object.entries(rawCells).map(([k, v]) => [k, { correctAnswer: String(v) }])),
             caseSensitive: correct.caseSensitive === true,
         };
     }
+    if (answer.questionType === 'CROSSWORD_PUZZLE' && isRecord(correct.cells)) {
+        const rawCells = correct.cells;
+        result.cellAnswersMap[answer.questionId] = {
+            cells: Object.fromEntries(Object.entries(rawCells).map(([k, v]) => [k, { correctAnswer: String(v) }])),
+            caseSensitive: correct.caseSensitive === true,
+        };
+    }
 }
 function transformStudentAnswer(questionId, questionType, value) {
     if (value == null)

package/dist/shared/lib/utils/question-reverse-transform.js

@@ -315,6 +315,7 @@ const reverseAnswerTheQuestionGroup = (apiQuestion) => {
             items,
             explanation: asString(apiQuestion.explanation),
             points: items.reduce((total, item) => (item.isExample ? total : total + item.points), 0),
+            ...(meta.gradingType === 'MAPPING' ? { gradingType: 'MAPPING' } : {}),
         },
     };
 };
@@ -404,6 +405,13 @@ const reverseChooseThenAnswerGroup = (apiQuestion) => {
             question: asString(itemContent.question),
             options,
             optionId: asString(rawAnswer.optionId) || options[0]?.id || '',
+            expectedAnswers: (() => {
+                const raw = asArray(rawAnswer.expectedAnswers)
+                    .filter((value) => typeof value === 'string')
+                    .map((value) => value.trim())
+                    .filter((value) => value !== '');
+                return raw.length > 0 ? raw : [''];
+            })(),
             isExample,
             points: isExample ? 0 : asNumber(item.points, 1),
             questionNumber: asNumber(item.questionNumber, index + 1),
@@ -529,18 +537,27 @@ const reverseCrossOutWordGroup = (apiQuestion) => {
         const fallback = asRecord(fallbackAnswers[index]);
         const answerRaw = Object.keys(itemAnswer).length > 0 ? itemAnswer : fallback;
         const isExample = item.isExample === true;
-        const type = itemContent.type === 'CROSS_OUT_AND_REPLACE' ||
-            answerRaw.type === 'CROSS_OUT_AND_REPLACE'
+        const type = itemContent.type === 'CROSS_OUT_AND_REPLACE'
             ? 'CROSS_OUT_AND_REPLACE'
-            : 'CROSS_OUT';
+            : itemContent.type === 'CROSS_OUT'
+                ? 'CROSS_OUT'
+                : answerRaw.type === 'CROSS_OUT_AND_REPLACE'
+                    ? 'CROSS_OUT_AND_REPLACE'
+                    : 'CROSS_OUT';
+        const rawIndex = answerRaw.wordIndex;
+        const wordIndex = typeof rawIndex === 'number' && Number.isInteger(rawIndex) && rawIndex >= 0
+            ? rawIndex
+            : null;
         const correctAnswer = type === 'CROSS_OUT_AND_REPLACE'
             ? {
                 type: 'CROSS_OUT_AND_REPLACE',
+                wordIndex,
                 crossOut: asString(answerRaw.crossOut),
                 replaceWith: asString(answerRaw.replaceWith),
             }
             : {
                 type: 'CROSS_OUT',
+                wordIndex,
                 crossOut: asString(answerRaw.crossOut),
             };
         return {
@@ -630,12 +647,14 @@ const reverseSpontaneousQaGroup = (apiQuestion) => {
                 const fallback = asRecord(flattenedAnswers[questionIndex]);
                 const expected = asArray(childAnswer.expectedAnswers ?? fallback.expectedAnswers)
                     .filter((value) => typeof value === 'string');
+                const isExample = child.isExample === true;
                 return {
                     questionText: asString(childContent.questionText),
                     inputType: asString(childContent.inputType, 'TEXT') === 'AUDIO' ? 'AUDIO' : 'TEXT',
                     audioUrl: asString(childContent.audioUrl),
                     expectedAnswers: expected.length > 0 ? expected : [''],
-                    points: asNumber(child.points, 1),
+                    isExample,
+                    points: isExample ? 0 : asNumber(child.points, 1),
                     questionNumber: asNumber(child.questionNumber, questionIndex + 1),
                 };
             }),
@@ -882,6 +901,9 @@ function reverseCrosswordPuzzle(apiQuestion) {
     const rows = apiContent.gridSize?.rows || apiContent.rows || 12;
     const cols = apiContent.gridSize?.cols || apiContent.cols || 12;
     const title = apiContent.title || '';
+    const type = apiContent.type === 'HIDDEN_WORD' ? 'HIDDEN_WORD' : 'STANDARD';
+    const instruction = asString(apiQuestion.instruction, asString(apiContent.instruction));
+    const markedColumn = typeof apiContent.markedColumn === 'number' ? apiContent.markedColumn : undefined;
     const across = Array.isArray(apiContent.clues?.across) ? apiContent.clues.across : [];
     const down = Array.isArray(apiContent.clues?.down) ? apiContent.clues.down : [];
     const answers = apiAnswer.answers || {};
@@ -896,6 +918,7 @@ function reverseCrosswordPuzzle(apiQuestion) {
             length: a.length || 1,
             direction: 'across',
             answer: answers[`across-${a.number}`] || '',
+            ...(a.isExample === true ? { isExample: true } : {}),
         });
     }
     for (const d of down) {
@@ -908,24 +931,32 @@ function reverseCrosswordPuzzle(apiQuestion) {
             length: d.length || 1,
             direction: 'down',
             answer: answers[`down-${d.number}`] || '',
+            ...(d.isExample === true ? { isExample: true } : {}),
         });
     }
     return {
         content: {
+            type,
             title,
+            instruction,
             rows,
             cols,
             gridSize: { rows, cols },
+            ...(type === 'HIDDEN_WORD' && markedColumn ? { markedColumn } : {}),
             clues: { across, down },
         },
         answer: {
+            type,
             title,
+            instruction,
             rows,
             cols,
+            ...(type === 'HIDDEN_WORD' && markedColumn ? { markedColumn } : {}),
+            hiddenWord: answers['hidden-word'] || '',
             clues,
             answers,
             caseSensitive: apiAnswer.caseSensitive || false,
-            explanation: apiQuestion.explanation || '',
+            explanation: asString(apiQuestion.explanation),
         },
     };
 }
@@ -936,6 +967,7 @@ function reverseFindWordsInMatrix(apiQuestion) {
     const rows = apiContent.gridSize?.rows || (Array.isArray(apiContent.grid) ? apiContent.grid.length : 14);
     const cols = apiContent.gridSize?.cols || (Array.isArray(apiContent.grid?.[0]) ? apiContent.grid[0].length : 14);
     const title = apiContent.title || '';
+    const instruction = typeof apiContent.instruction === 'string' ? apiContent.instruction : '';
     const grid = Array.isArray(apiContent.grid) ? apiContent.grid : [];
     const categories = Array.isArray(apiContent.categories) ? apiContent.categories : [];
     const wordBank = Array.isArray(apiContent.wordBank) ? apiContent.wordBank : [];
@@ -969,6 +1001,7 @@ function reverseFindWordsInMatrix(apiQuestion) {
         content: {
             type,
             title,
+            instruction,
             rows,
             cols,
             gridSize: { rows, cols },
@@ -981,6 +1014,7 @@ function reverseFindWordsInMatrix(apiQuestion) {
         answer: {
             type,
             title,
+            instruction,
             rows,
             cols,
             grid,

package/dist/shared/types/questions/answer-the-question-group.d.ts

@@ -1,4 +1,8 @@
-export declare const ANSWER_THE_QUESTION_GROUP_GRADING_TYPE: "AI";
+export declare const ANSWER_THE_QUESTION_GROUP_GRADING_TYPES: readonly ["AI", "MAPPING"];
+export type AnswerTheQuestionGroupGradingType = (typeof ANSWER_THE_QUESTION_GROUP_GRADING_TYPES)[number];
+/** Default for newly created groups. */
+export declare const ANSWER_THE_QUESTION_GROUP_GRADING_TYPE: AnswerTheQuestionGroupGradingType;
+export declare function resolveAnswerTheQuestionGroupGradingType(value: unknown): AnswerTheQuestionGroupGradingType;
 export interface AnswerTheQuestionGroupItemContent {
     question: string;
     imageUrl?: string | string[];
@@ -20,8 +24,9 @@ export interface AnswerTheQuestionGroupContent {
         passage?: string;
         audioUrl?: string;
         imageUrl?: string | string[];
-        gradingType: typeof ANSWER_THE_QUESTION_GROUP_GRADING_TYPE;
-        isAiGraded: true;
+        /** AI = LLM short-answer; MAPPING = exact-match expectedAnswers. */
+        gradingType: AnswerTheQuestionGroupGradingType;
+        isAiGraded: boolean;
     };
     items: AnswerTheQuestionGroupItem[];
 }

package/dist/shared/types/questions/answer-the-question-group.js

@@ -1 +1,6 @@
+export const ANSWER_THE_QUESTION_GROUP_GRADING_TYPES = ['AI', 'MAPPING'];
+/** Default for newly created groups. */
 export const ANSWER_THE_QUESTION_GROUP_GRADING_TYPE = 'AI';
+export function resolveAnswerTheQuestionGroupGradingType(value) {
+    return value === 'MAPPING' ? 'MAPPING' : 'AI';
+}

package/dist/shared/types/questions/choose-then-answer-group.d.ts

@@ -4,6 +4,7 @@ export interface ChooseThenAnswerOption {
 }
 export interface ChooseThenAnswerItemAnswer {
     optionId: string;
+    expectedAnswers?: string[];
 }
 export interface ChooseThenAnswerStudentItemAnswer {
     optionId: string;
@@ -27,6 +28,8 @@ export interface ChooseThenAnswerGroupContent {
     meta?: {
         instruction?: string;
         title?: string;
+        gradingType?: 'AI';
+        isAiGraded?: boolean;
     };
     items: ChooseThenAnswerGroupItem[];
 }

package/dist/shared/types/questions/crossword-puzzle.d.ts

@@ -20,6 +20,7 @@ export type CrosswordSubtype = 'STANDARD' | 'HIDDEN_WORD';
 export interface CrosswordPuzzleContent {
     type?: CrosswordSubtype;
     title?: string;
+    instruction?: string;
     gridSize: {
         rows: number;
         cols: number;

package/dist/shared/types/questions/find-words-in-matrix.d.ts

@@ -30,6 +30,7 @@ export interface ExampleSelection {
 export interface FindWordsInMatrixContent {
     type?: FindWordsInMatrixType;
     title?: string;
+    instruction?: string;
     gridSize: {
         rows: number;
         cols: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinyweb_dev/oe-exam-sdk",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Reusable OceanEdu question components.",
   "type": "module",
   "main": "./dist/index.js",