@tinyweb_dev/oe-exam-sdk 0.2.9 → 0.2.10

package/dist/components/questions/types/word-ordering-group/map-word-ordering-group-data.d.ts

@@ -0,0 +1,4 @@
+import { type WordOrderingGroupData, type WordOrderingGroupItemData } from '../../_shared/types/word-ordering-group.type';
+export declare function createEmptyWordOrderingGroupItem(questionNumber: number): WordOrderingGroupItemData;
+export declare function mapWordOrderingGroupItem(item: unknown, index: number, fallbackAnswer?: unknown): WordOrderingGroupItemData;
+export declare function mapQuestionToWordOrderingGroupData(question: Record<string, unknown> | null | undefined): WordOrderingGroupData;

package/dist/components/questions/types/word-ordering-group/map-word-ordering-group-data.js

@@ -0,0 +1,74 @@
+import { WORD_ORDERING_GROUP_DEFAULT_INSTRUCTION, } from '../../_shared/types/word-ordering-group.type';
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function asRecord(value) {
+    return isRecord(value) ? value : {};
+}
+function asString(value, fallback = '') {
+    return typeof value === 'string' ? value : fallback;
+}
+function asStringList(value) {
+    if (!Array.isArray(value))
+        return [];
+    return value
+        .map((item) => (typeof item === 'string' ? item.trim() : ''))
+        .filter(Boolean);
+}
+export function createEmptyWordOrderingGroupItem(questionNumber) {
+    return {
+        words: ['', ''],
+        answer: ['', ''],
+        isExample: false,
+        points: 1,
+        questionNumber,
+    };
+}
+export function mapWordOrderingGroupItem(item, index, fallbackAnswer) {
+    const record = asRecord(item);
+    const content = asRecord(record.content);
+    const correctAnswer = asRecord(record.correctAnswer);
+    const isExample = record.isExample === true;
+    const words = asStringList(content.words).length
+        ? asStringList(content.words)
+        : asStringList(record.words);
+    const answer = asStringList(correctAnswer.answer).length
+        ? asStringList(correctAnswer.answer)
+        : asStringList(record.answer).length
+            ? asStringList(record.answer)
+            : asStringList(fallbackAnswer);
+    return {
+        words,
+        answer,
+        isExample,
+        points: isExample ? 0 : (typeof record.points === 'number' ? record.points : 1),
+        questionNumber: typeof record.questionNumber === 'number' ? record.questionNumber : index + 1,
+    };
+}
+export function mapQuestionToWordOrderingGroupData(question) {
+    const source = asRecord(question);
+    const content = asRecord(source.content);
+    const meta = asRecord(content.meta);
+    const answer = asRecord(source.answer);
+    const correctAnswer = asRecord(source.correctAnswer ?? source.correct_answer ?? answer.correctAnswer);
+    const explanation = asString(source.explanation) || asString(answer.explanation);
+    const fallbackAnswers = Array.isArray(correctAnswer.answer) ? correctAnswer.answer : [];
+    if (Array.isArray(content.items) || Array.isArray(answer.items)) {
+        const rawItems = Array.isArray(content.items) ? content.items : answer.items;
+        const items = rawItems.map((item, index) => mapWordOrderingGroupItem(item, index, fallbackAnswers[index]));
+        return {
+            instruction: asString(meta.instruction) ||
+                asString(answer.instruction) ||
+                WORD_ORDERING_GROUP_DEFAULT_INSTRUCTION,
+            items,
+            explanation,
+            points: items.reduce((total, item) => (item.isExample ? total : total + (item.points || 0)), 0),
+        };
+    }
+    return {
+        instruction: WORD_ORDERING_GROUP_DEFAULT_INSTRUCTION,
+        items: [createEmptyWordOrderingGroupItem(1)],
+        explanation,
+        points: 1,
+    };
+}

package/dist/components/questions/types/word-ordering-group/register.d.ts

@@ -0,0 +1,2 @@
+import type { QuestionTypeRegistration } from '../../creator/question-type-registry';
+export declare const wordOrderingGroupRegistration: QuestionTypeRegistration;

package/dist/components/questions/types/word-ordering-group/register.js

@@ -0,0 +1,36 @@
+import { WordOrderingGroupCreator } from './WordOrderingGroupCreator';
+import { mapQuestionToWordOrderingGroupData } from './map-word-ordering-group-data';
+export const wordOrderingGroupRegistration = {
+    component: WordOrderingGroupCreator,
+    transformInitialData: (initialData) => mapQuestionToWordOrderingGroupData(initialData),
+    getExtraProps: (ctx) => ({
+        onUnsavedChangesChange: ctx.onUnsavedChangesChange,
+        validationRef: ctx.validationRef,
+    }),
+    wrapOnSave: (data, ctx) => {
+        const payload = data;
+        return {
+            type: ctx.questionType,
+            content: ctx.state.content,
+            points: payload.points ?? ctx.state.points ?? 1,
+            level: ctx.state.level,
+            difficulty: ctx.state.difficulty,
+            skill: ctx.state.skill,
+            answer: payload,
+            explanation: payload.explanation || '',
+        };
+    },
+    wrapOnChange: (data, ctx) => {
+        const payload = data;
+        return {
+            type: ctx.questionType,
+            content: ctx.state.content,
+            points: payload.points ?? ctx.state.points ?? 1,
+            level: ctx.state.level,
+            difficulty: ctx.state.difficulty,
+            skill: ctx.state.skill,
+            answer: payload,
+            explanation: payload.explanation || '',
+        };
+    },
+};

package/dist/components/questions/types/word-ordering-group/transform.d.ts

@@ -0,0 +1,2 @@
+import type { TransformHandler } from '../../../../shared/lib/utils/question-transform-types';
+export declare const transformWordOrderingGroup: TransformHandler;

package/dist/components/questions/types/word-ordering-group/transform.js

@@ -0,0 +1,33 @@
+import { WORD_ORDERING_GROUP_DEFAULT_INSTRUCTION, WORD_ORDERING_ITEM_TYPE, } from '../../_shared/types/word-ordering-group.type';
+function tokens(value) {
+    if (!Array.isArray(value))
+        return [];
+    return value
+        .filter((item) => typeof item === 'string')
+        .map((item) => item.trim())
+        .filter(Boolean);
+}
+export const transformWordOrderingGroup = (question) => {
+    const answerData = question.answer;
+    const items = Array.isArray(answerData?.items) ? answerData.items : [];
+    const apiItems = items.map((item, index) => ({
+        questionType: WORD_ORDERING_ITEM_TYPE,
+        ...(item.isExample ? { isExample: true } : {}),
+        content: { words: tokens(item.words) },
+        correctAnswer: { answer: tokens(item.answer) },
+        points: item.isExample ? 0 : (typeof item.points === 'number' ? item.points : 1),
+        questionNumber: item.questionNumber || index + 1,
+    }));
+    return {
+        apiContent: {
+            meta: {
+                instruction: answerData?.instruction || WORD_ORDERING_GROUP_DEFAULT_INSTRUCTION,
+            },
+            items: apiItems,
+        },
+        apiCorrectAnswer: {
+            answer: apiItems.map((item) => item.correctAnswer.answer),
+        },
+        totalPoints: items.reduce((total, item) => (item.isExample ? total : total + (typeof item.points === 'number' ? item.points : 1)), 0),
+    };
+};

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

@@ -0,0 +1,8 @@
+import type { Question } from '../../../shared/types/entities/question.types';
+import type { MatchColumnsStudentItemAnswer } from '../_shared/types/match-columns-to-make-sentences.type';
+export declare function MatchColumnsToMakeSentencesViewer({ question, isReviewMode, userAnswer, onSubmitAnswer, }: {
+    question: Question;
+    isReviewMode?: boolean;
+    userAnswer?: unknown;
+    onSubmitAnswer?: (answer: MatchColumnsStudentItemAnswer[]) => void;
+}): import("react").JSX.Element;

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

@@ -0,0 +1,49 @@
+'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useState } from 'react';
+import { MatchColumnsToMakeSentencesClient } from '../types/match-columns-to-make-sentences/MatchColumnsToMakeSentencesClient';
+import { mapQuestionToMatchColumnsGroupData } from '../types/match-columns-to-make-sentences/map-match-columns-to-make-sentences-data';
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function parseAnswers(value, length) {
+    const source = Array.isArray(value)
+        ? value
+        : isRecord(value) && Array.isArray(value.answer)
+            ? value.answer
+            : null;
+    if (!source)
+        return undefined;
+    return Array.from({ length }, (_, index) => {
+        const raw = source[index];
+        if (!isRecord(raw))
+            return { fragmentIds: [], sentence: '' };
+        return {
+            fragmentIds: Array.isArray(raw.fragmentIds)
+                ? raw.fragmentIds.filter((id) => typeof id === 'string')
+                : [],
+            sentence: typeof raw.sentence === 'string' ? raw.sentence : '',
+        };
+    });
+}
+export function MatchColumnsToMakeSentencesViewer({ question, isReviewMode = false, userAnswer, onSubmitAnswer, }) {
+    const questionData = mapQuestionToMatchColumnsGroupData(question);
+    const itemCount = questionData.items.length;
+    const parsedUser = parseAnswers(userAnswer, itemCount);
+    const questionKey = `${question.id}:${itemCount}`;
+    const [cachedKey, setCachedKey] = useState(questionKey);
+    const [localAnswers, setLocalAnswers] = useState(() => parsedUser ?? questionData.items.map((item) => (item.isExample
+        ? { fragmentIds: item.fragmentIds, sentence: item.sentence }
+        : { fragmentIds: [item.stemFragmentId], sentence: '' })));
+    if (cachedKey !== questionKey) {
+        setCachedKey(questionKey);
+        setLocalAnswers(parsedUser ?? questionData.items.map((item) => (item.isExample
+            ? { fragmentIds: item.fragmentIds, sentence: item.sentence }
+            : { fragmentIds: [item.stemFragmentId], sentence: '' })));
+    }
+    const userAnswers = parsedUser ?? localAnswers;
+    return (_jsx(MatchColumnsToMakeSentencesClient, { questionData: questionData, isReviewMode: isReviewMode, userAnswers: userAnswers, onAnswerChange: isReviewMode ? undefined : (next) => {
+            setLocalAnswers(next);
+            onSubmitAnswer?.(next);
+        } }));
+}

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

@@ -1,7 +1,7 @@
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { MatchWordToPictureGroupClient } from '../types/match-word-to-picture/MatchWordToPictureGroupClient';
-import { mapQuestionToMatchWordToPictureGroupData } from '../types/match-word-to-picture/map-match-word-to-picture-group-data';
+import { MatchWordToPictureGroupClient } from '../types/match-word-to-picture-group/MatchWordToPictureGroupClient';
+import { mapQuestionToMatchWordToPictureGroupData } from '../types/match-word-to-picture-group/map-match-word-to-picture-group-data';
 export function MatchWordToPictureGroupViewer({ question, isReviewMode = false, userAnswer, onSubmitAnswer, }) {
     const questionData = mapQuestionToMatchWordToPictureGroupData(question);
     const reviewAnswers = isReviewMode && !userAnswer

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

@@ -34,6 +34,8 @@ import { WordOrderAndMatchGroupViewer } from './WordOrderAndMatchGroupViewer';
 import { AnswerTheQuestionGroupViewer } from './AnswerTheQuestionGroupViewer';
 import { MatchWordToPictureViewer } from './MatchWordToPictureViewer';
 import { MatchWordToPictureGroupViewer } from './MatchWordToPictureGroupViewer';
+import { MatchColumnsToMakeSentencesViewer } from './MatchColumnsToMakeSentencesViewer';
+import { WordOrderingGroupViewer } from './WordOrderingGroupViewer';
 export function QuestionViewer({ question, onSubmitAnswer, isReviewMode = false, userAnswer, }) {
     const [selectedAnswer, setSelectedAnswer] = useState(userAnswer || null);
     const [playCount, setPlayCount] = useState(0);
@@ -641,6 +643,8 @@ export function QuestionViewer({ question, onSubmitAnswer, isReviewMode = false,
                 return (_jsx(FillInBlankGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'MATCHING_WITH_LINES_GROUP':
                 return (_jsx(MatchingWithLinesGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
+            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 }));
             case 'ANSWER_THE_QUESTION_GROUP':
@@ -650,6 +654,8 @@ export function QuestionViewer({ question, onSubmitAnswer, isReviewMode = false,
             case 'WORD_ORDER_AND_MATCH_GROUP':
             case 'WORD_ORDER_AND_MATCH':
                 return (_jsx(WordOrderAndMatchGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer }));
+            case 'WORD_ORDERING_GROUP':
+                return (_jsx(WordOrderingGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'MATCH_WORD_TO_PICTURE_GROUP':
                 return (_jsx(MatchWordToPictureGroupViewer, { question: question, isReviewMode: isReviewMode, userAnswer: userAnswer, onSubmitAnswer: onSubmitAnswer }));
             case 'MATCH_WORD_TO_PICTURE':

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

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

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

@@ -0,0 +1,29 @@
+'use client';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useState } from 'react';
+import { WordOrderingGroupClient } from '../types/word-ordering-group/WordOrderingGroupClient';
+import { mapQuestionToWordOrderingGroupData } from '../types/word-ordering-group/map-word-ordering-group-data';
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+function parseAnswers(value, length) {
+    const source = Array.isArray(value)
+        ? value
+        : isRecord(value) && Array.isArray(value.answer)
+            ? value.answer
+            : null;
+    if (!source)
+        return undefined;
+    return Array.from({ length }, (_, index) => Array.isArray(source[index])
+        ? source[index].filter((token) => typeof token === 'string')
+        : []);
+}
+export function WordOrderingGroupViewer({ question, isReviewMode = false, userAnswer, onSubmitAnswer, }) {
+    const questionData = mapQuestionToWordOrderingGroupData(question);
+    const parsedUser = parseAnswers(userAnswer, questionData.items.length);
+    const [localAnswers, setLocalAnswers] = useState(() => parsedUser ?? questionData.items.map((item) => (item.isExample ? item.answer : [])));
+    return (_jsx(WordOrderingGroupClient, { questionData: questionData, isReviewMode: isReviewMode, userAnswers: parsedUser ?? localAnswers, onAnswerChange: isReviewMode ? undefined : (next) => {
+            setLocalAnswers(next);
+            onSubmitAnswer?.(next);
+        } }));
+}

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

@@ -12,3 +12,5 @@ export { WordOrderAndMatchGroupViewer } from './WordOrderAndMatchGroupViewer';
 export { AnswerTheQuestionGroupViewer } from './AnswerTheQuestionGroupViewer';
 export { MatchWordToPictureViewer } from './MatchWordToPictureViewer';
 export { MatchWordToPictureGroupViewer } from './MatchWordToPictureGroupViewer';
+export { MatchColumnsToMakeSentencesViewer } from './MatchColumnsToMakeSentencesViewer';
+export { WordOrderingGroupViewer } from './WordOrderingGroupViewer';

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

@@ -12,3 +12,5 @@ export { WordOrderAndMatchGroupViewer } from './WordOrderAndMatchGroupViewer';
 export { AnswerTheQuestionGroupViewer } from './AnswerTheQuestionGroupViewer';
 export { MatchWordToPictureViewer } from './MatchWordToPictureViewer';
 export { MatchWordToPictureGroupViewer } from './MatchWordToPictureGroupViewer';
+export { MatchColumnsToMakeSentencesViewer } from './MatchColumnsToMakeSentencesViewer';
+export { WordOrderingGroupViewer } from './WordOrderingGroupViewer';

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

@@ -40,7 +40,7 @@ export function renderDedicatedReviewBody(ctx) {
         }
         case 'CHOOSE_THE_CORRECT_ANSWER_GROUP': {
             const data = transformChooseTheCorrectAnswerGroup(apiQuestions);
-            return (_jsx(ReviewChooseBestAnswerRenderer, { partNumber: partNo, questionCount: questionCount, partName: part.name, instruction: part.instructions || data.instruction, audioUrl: data.audioUrl, questions: data.questions, answers: answers, isCorrectMap: isCorrectMap, correctOptionIdMap: correctOptionIdMap, example: data.example }));
+            return (_jsx(ReviewChooseBestAnswerRenderer, { partNumber: partNo, questionCount: questionCount, partName: part.name, instruction: part.instructions || data.instruction, audioUrl: data.audioUrl, imageUrl: data.imageUrl, questions: data.questions, answers: answers, isCorrectMap: isCorrectMap, correctOptionIdMap: correctOptionIdMap, example: data.example }));
         }
         case 'CHOOSE_CORRECT_ADJECTIVE': {
             const data = transformChooseCorrectAdjective(apiQuestions);

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

@@ -4,8 +4,8 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * Movers fallback review cases (isReviewMode=true).
  * Source: oe-exam-fe ReviewQuestionRenderer.tsx
  */
-import { MoversAnswerTheQuestionRenderer, MoversFillWordHintRenderer, MoversGridFillRenderer, MoversLabelThePictureRenderer, MoversMatchByWritingAnswerRenderer, MoversMatchWordToPictureRenderer, MoversPictureChooseRenderer, MoversPictureFillBlankChooseRenderer, MoversReadingPassageRenderer, MoversTrueFalseRenderer, MoversTrueFalseCorrectGroupRenderer, MoversFillInBlankGroupRenderer, MoversMatchingWithLinesGroupRenderer, MoversCrossOutWordGroupRenderer, MoversWordFillParagraphRenderer, MoversWordFillStructuredFormRenderer, MoversWordOrderingRenderer, MoversWriteSentencesRenderer, MoversWritingRenderer, MoversCrosswordPuzzleRenderer, } from '../../../components/exams/take/components/question-renderers';
-import { transformAnswerTheQuestion, transformFillWordHint, transformGridFill, transformLabelPicture, transformMatchByWritingAnswer, transformMatchWordToPicture, transformPictureChoose, transformPictureFillBlankChoose, transformReadingPassage, transformTrueFalse, transformTrueFalseCorrectGroup, transformFillInBlankGroup, transformMatchingWithLinesGroup, transformWordFillParagraph, transformWordFillStructuredForm, transformWordOrdering, transformWriteSentences, transformWriteShortLetter, transformCrosswordPuzzle, } from '../../../components/exams/take/utils/question-transformers';
+import { MoversAnswerTheQuestionRenderer, MoversFillWordHintRenderer, MoversGridFillRenderer, MoversLabelThePictureRenderer, MoversMatchByWritingAnswerRenderer, MoversMatchWordToPictureRenderer, MoversPictureChooseRenderer, MoversPictureFillBlankChooseRenderer, MoversReadingPassageRenderer, MoversTrueFalseRenderer, MoversTrueFalseCorrectGroupRenderer, MoversFillInBlankGroupRenderer, MoversMatchingWithLinesGroupRenderer, MoversCrossOutWordGroupRenderer, MoversWordFillParagraphRenderer, MoversWordFillStructuredFormRenderer, MoversWordOrderingRenderer, MoversWordOrderingGroupRenderer, MoversWriteSentencesRenderer, MoversWritingRenderer, MoversCrosswordPuzzleRenderer, } from '../../../components/exams/take/components/question-renderers';
+import { transformAnswerTheQuestion, transformFillWordHint, transformGridFill, transformLabelPicture, transformMatchByWritingAnswer, transformMatchWordToPicture, transformPictureChoose, transformPictureFillBlankChoose, transformReadingPassage, transformTrueFalse, transformTrueFalseCorrectGroup, transformFillInBlankGroup, transformMatchingWithLinesGroup, transformWordFillParagraph, transformWordFillStructuredForm, transformWordOrdering, transformWordOrderingGroupTake, transformWriteSentences, transformWriteShortLetter, transformCrosswordPuzzle, } from '../../../components/exams/take/utils/question-transformers';
 import { normalizeCrossOutWordGroupAnswer, transformCrossOutWordGroup, } from '../../../components/exams/take/utils/cross-out-word-group.transformer';
 function asApiQuestions(questions) {
     return questions;
@@ -189,6 +189,10 @@ export function renderMoversReviewBody(ctx) {
             const data = transformMatchWordToPicture(apiQuestions);
             return (_jsx(MoversMatchWordToPictureRenderer, { partNumber: partNo, partName: part.name, instruction: part.instructions || data.instruction, questionCount: questionCount, wordBank: data.wordBank, questions: data.questions, answers: answers, onAnswerChange: handleAnswerChange, isReviewMode: true, correctAnswerTextMap: correctAnswerTextMap, isCorrectMap: isCorrectMap }));
         }
+        case 'WORD_ORDERING_GROUP': {
+            const data = transformWordOrderingGroupTake(apiQuestions);
+            return (_jsx(MoversWordOrderingGroupRenderer, { partNumber: partNo, partName: part.name, instruction: part.instructions || data.instruction, questionCount: data.questions.filter((q) => !q.isExample).length, data: data, answers: answers, onAnswerChange: handleAnswerChange, isReviewMode: true }));
+        }
         case 'WORD_ORDERING': {
             const data = transformWordOrdering(apiQuestions);
             return (_jsx(MoversWordOrderingRenderer, { partNumber: partNo, partName: part.name, instruction: part.instructions || data.instruction, questionCount: questionCount, questions: data.questions, answers: answers, onAnswerChange: handleAnswerChange, isReviewMode: true, rawCorrectAnswerMap: rawCorrectAnswerMap, isCorrectMap: isCorrectMap }));

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

@@ -231,6 +231,19 @@ function transformStudentAnswer(questionId, questionType, value) {
             return [`${questionId}-item-${index}`, { answers: [] }];
         }));
     }
+    if (questionType === 'WORD_ORDERING_GROUP') {
+        const answer = Array.isArray(record.answer)
+            ? record.answer
+            : Array.isArray(value)
+                ? value
+                : [];
+        return Object.fromEntries(answer.map((item, index) => [
+            `${questionId}-item-${index}`,
+            Array.isArray(item)
+                ? item.filter((token) => typeof token === 'string')
+                : [],
+        ]));
+    }
     if (questionType === 'MATCHING_WITH_LINES_GROUP') {
         const answer = Array.isArray(record.answer)
             ? record.answer

package/dist/index.d.ts

@@ -26,4 +26,4 @@ export { validateQuestion } from './components/questions/_shared/utils/question-
 export { buildAnswerPayload } from './components/questions/_shared/utils/answer-builder';
 export type { QuestionFormState } from './components/questions/_shared/hooks/useQuestionFormState';
 export * from './components/questions/_shared/types';
-export { QuestionViewer, QuestionGroupViewer, WordFillStructuredFormViewer, ChooseTheCorrectAnswerGroupViewer, TrueFalseGroupViewer, TrueFalseCorrectGroupViewer, FillInBlankGroupViewer, MatchingWithLinesGroupViewer, CrossOutWordGroupViewer, SpontaneousQaGroupViewer, WordOrderAndMatchGroupViewer, AnswerTheQuestionGroupViewer, MatchWordToPictureViewer, MatchWordToPictureGroupViewer, } from './components/questions/viewer';
+export { QuestionViewer, QuestionGroupViewer, WordFillStructuredFormViewer, ChooseTheCorrectAnswerGroupViewer, TrueFalseGroupViewer, TrueFalseCorrectGroupViewer, FillInBlankGroupViewer, MatchingWithLinesGroupViewer, CrossOutWordGroupViewer, SpontaneousQaGroupViewer, WordOrderAndMatchGroupViewer, AnswerTheQuestionGroupViewer, MatchWordToPictureViewer, MatchWordToPictureGroupViewer, MatchColumnsToMakeSentencesViewer, WordOrderingGroupViewer, } from './components/questions/viewer';

package/dist/index.js

@@ -21,4 +21,4 @@ export { QUESTION_TYPE_CONFIG, QUESTION_TYPES_WITH_DEDICATED_COMPONENTS } from '
 export { validateQuestion } from './components/questions/_shared/utils/question-validation';
 export { buildAnswerPayload } from './components/questions/_shared/utils/answer-builder';
 export * from './components/questions/_shared/types';
-export { QuestionViewer, QuestionGroupViewer, WordFillStructuredFormViewer, ChooseTheCorrectAnswerGroupViewer, TrueFalseGroupViewer, TrueFalseCorrectGroupViewer, FillInBlankGroupViewer, MatchingWithLinesGroupViewer, CrossOutWordGroupViewer, SpontaneousQaGroupViewer, WordOrderAndMatchGroupViewer, AnswerTheQuestionGroupViewer, MatchWordToPictureViewer, MatchWordToPictureGroupViewer, } from './components/questions/viewer';
+export { QuestionViewer, QuestionGroupViewer, WordFillStructuredFormViewer, ChooseTheCorrectAnswerGroupViewer, TrueFalseGroupViewer, TrueFalseCorrectGroupViewer, FillInBlankGroupViewer, MatchingWithLinesGroupViewer, CrossOutWordGroupViewer, SpontaneousQaGroupViewer, WordOrderAndMatchGroupViewer, AnswerTheQuestionGroupViewer, MatchWordToPictureViewer, MatchWordToPictureGroupViewer, MatchColumnsToMakeSentencesViewer, WordOrderingGroupViewer, } from './components/questions/viewer';

package/dist/shared/constants/question-skills.js

@@ -84,6 +84,9 @@ export const QUESTION_TYPE_SKILLS = {
     'WORD_FILL_STRUCTURED_FORM': SkillEnum.READING,
     'CROSSWORD_PUZZLE': SkillEnum.READING,
     'FIND_WORDS_IN_MATRIX': SkillEnum.READING,
+    'MATCH_COLUMNS_TO_MAKE_SENTENCES': SkillEnum.READING,
+    'MATCH_WORD_TO_PICTURE_GROUP': SkillEnum.READING,
+    'WORD_ORDERING_GROUP': SkillEnum.READING,
     // ========================================
     // WRITING SKILLS (Viết)
     // ========================================
@@ -216,6 +219,9 @@ export const QUESTION_TYPE_LABELS = {
     'WORD_FILL_STRUCTURED_FORM': 'Điền từ vào biểu mẫu có cấu trúc',
     'CROSSWORD_PUZZLE': 'Giải ô chữ (Crossword)',
     'FIND_WORDS_IN_MATRIX': 'Tìm từ trong ma trận (Word Search)',
+    'MATCH_COLUMNS_TO_MAKE_SENTENCES': 'Ghép cột thành câu',
+    'MATCH_WORD_TO_PICTURE_GROUP': 'Nối từ với tranh (nhóm)',
+    'WORD_ORDERING_GROUP': 'Sắp xếp từ (nhóm)',
     // ========================================
     // WRITING SKILLS (Viết)
     // ========================================

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

@@ -226,7 +226,9 @@ function normalizeChooseAnswerGroupImageUrl(value) {
 const reverseChooseTheCorrectAnswerGroup = (apiQuestion) => {
     const content = asRecord(apiQuestion.content);
     const answer = readAnswer(apiQuestion);
-    const fallbackAnswers = asArray(answer.answer).map((item) => asString(item));
+    const fallbackAnswers = asArray(answer.answer).map((item) => (asString(item) || (Array.isArray(item)
+        ? asString(item.find((token) => typeof token === 'string' && token.trim() !== ''))
+        : '')));
     const items = asArray(content.items).map((rawItem, index) => {
         const item = asRecord(rawItem);
         const itemContent = asRecord(item.content);
@@ -251,7 +253,13 @@ const reverseChooseTheCorrectAnswerGroup = (apiQuestion) => {
                 { id: 'opt-2', text: '' },
                 { id: 'opt-3', text: '' },
             ],
-            correctAnswer: asString(itemAnswer.answer) || fallbackAnswers[index] || options[0]?.id || 'opt-1',
+            correctAnswer: asString(itemAnswer.answer)
+                || (Array.isArray(itemAnswer.answer)
+                    ? asString(itemAnswer.answer.find((token) => typeof token === 'string' && token.trim() !== ''))
+                    : '')
+                || fallbackAnswers[index]
+                || options[0]?.id
+                || 'opt-1',
             isExample,
             points: isExample ? 0 : asNumber(item.points, 1),
             questionNumber: asNumber(item.questionNumber, index + 1),
@@ -260,12 +268,14 @@ const reverseChooseTheCorrectAnswerGroup = (apiQuestion) => {
         };
     });
     const audioUrl = asString(asRecord(content.meta).audioUrl).trim();
+    const imageUrl = normalizeChooseAnswerGroupImageUrl(asRecord(content.meta).imageUrl);
     return {
         content: '',
         answer: {
             instruction: asString(asRecord(content.meta).instruction, 'Choose the correct answer.'),
             passage: asString(asRecord(content.meta).passage),
             ...(audioUrl ? { audioUrl } : {}),
+            ...(imageUrl !== undefined ? { imageUrl } : {}),
             items,
             explanation: asString(apiQuestion.explanation),
             points: items.reduce((total, item) => (item.isExample ? total : total + item.points), 0),
@@ -603,6 +613,102 @@ const reverseSimpleAnswer = (apiQuestion) => {
         },
     };
 };
+const reverseWordOrderingGroup = (apiQuestion) => {
+    const content = asRecord(apiQuestion.content);
+    const answer = readAnswer(apiQuestion);
+    const fallbackAnswers = asArray(answer.answer);
+    const items = asArray(content.items);
+    const meta = asRecord(content.meta);
+    const mappedItems = items.map((rawItem, index) => {
+        const item = asRecord(rawItem);
+        const itemContent = asRecord(item.content);
+        const itemAnswer = asRecord(item.correctAnswer);
+        const isExample = item.isExample === true;
+        const words = asArray(itemContent.words).map((token) => asString(token)).filter(Boolean);
+        const itemTokens = asArray(itemAnswer.answer).map((token) => asString(token)).filter(Boolean);
+        const fallbackTokens = asArray(fallbackAnswers[index]).map((token) => asString(token)).filter(Boolean);
+        return {
+            words,
+            answer: itemTokens.length ? itemTokens : fallbackTokens,
+            isExample,
+            points: isExample ? 0 : (typeof item.points === 'number' ? item.points : 1),
+            questionNumber: typeof item.questionNumber === 'number' ? item.questionNumber : index + 1,
+        };
+    });
+    return {
+        content: '',
+        answer: {
+            instruction: asString(meta.instruction, 'Order the words.'),
+            items: mappedItems,
+            explanation: asString(apiQuestion.explanation),
+            points: mappedItems.reduce((total, item) => (item.isExample ? total : total + (item.points || 0)), 0),
+        },
+    };
+};
+const reverseMatchWordToPictureGroup = (apiQuestion) => {
+    const content = asRecord(apiQuestion.content);
+    const answer = readAnswer(apiQuestion);
+    const fallbackAnswers = asArray(answer.answer);
+    const items = asArray(content.items);
+    const meta = asRecord(content.meta);
+    const mappedItems = items.map((rawItem, index) => {
+        const item = asRecord(rawItem);
+        const itemContent = asRecord(item.content);
+        const itemAnswer = asRecord(item.correctAnswer);
+        const isExample = item.isExample === true;
+        return {
+            imageUrl: asString(itemContent.imageUrl),
+            correctAnswer: asString(itemAnswer.answer) || asString(fallbackAnswers[index]),
+            isExample,
+            points: isExample ? 0 : (typeof item.points === 'number' ? item.points : 1),
+            questionNumber: typeof item.questionNumber === 'number' ? item.questionNumber : index + 1,
+        };
+    });
+    return {
+        content: '',
+        answer: {
+            instruction: asString(meta.instruction, 'Look and complete.'),
+            wordBank: asArray(meta.wordBank).map((word) => asString(word)).filter(Boolean),
+            items: mappedItems,
+            explanation: asString(apiQuestion.explanation),
+            points: mappedItems.reduce((total, item) => (item.isExample ? total : total + (item.points || 0)), 0),
+        },
+    };
+};
+const reverseMatchColumnsToMakeSentences = (apiQuestion) => {
+    const content = asRecord(apiQuestion.content);
+    const answer = readAnswer(apiQuestion);
+    const fallbackAnswers = asArray(answer.answer);
+    const items = asArray(content.items);
+    const columns = asArray(content.columns);
+    const meta = asRecord(content.meta);
+    const mappedItems = items.map((rawItem, index) => {
+        const item = asRecord(rawItem);
+        const itemContent = asRecord(item.content);
+        const itemAnswer = asRecord(asRecord(item.correctAnswer).answer ?? fallbackAnswers[index]);
+        const fragmentIds = asArray(itemAnswer.fragmentIds).map((id) => asString(id)).filter(Boolean);
+        const isExample = item.isExample === true;
+        return {
+            stemFragmentId: asString(itemContent.stemFragmentId) || fragmentIds[0] || '',
+            fragmentIds,
+            sentence: asString(itemAnswer.sentence),
+            isExample,
+            points: isExample ? 0 : (typeof item.points === 'number' ? item.points : 1),
+            questionNumber: typeof item.questionNumber === 'number' ? item.questionNumber : index + 1,
+        };
+    });
+    return {
+        content: '',
+        answer: {
+            title: asString(meta.title),
+            instruction: asString(meta.instruction, 'Match the information to make sentences. You can use the same words more than once.'),
+            columns,
+            items: mappedItems,
+            explanation: asString(apiQuestion.explanation),
+            points: mappedItems.reduce((total, item) => (item.isExample ? total : total + (item.points || 0)), 0),
+        },
+    };
+};
 const handlers = {
     CHOOSE_THE_CORRECT_ANSWER: reverseChooseTheCorrectAnswer,
     CHOOSE_THE_CORRECT_ANSWER_GROUP: reverseChooseTheCorrectAnswerGroup,
@@ -653,6 +759,9 @@ const handlers = {
     GN_SPEAKING_INTERVIEW: reverseGroupPayload,
     CROSSWORD_PUZZLE: reverseCrosswordPuzzle,
     FIND_WORDS_IN_MATRIX: reverseFindWordsInMatrix,
+    MATCH_COLUMNS_TO_MAKE_SENTENCES: reverseMatchColumnsToMakeSentences,
+    MATCH_WORD_TO_PICTURE_GROUP: reverseMatchWordToPictureGroup,
+    WORD_ORDERING_GROUP: reverseWordOrderingGroup,
 };
 function reverseWriteAShortLetter(apiQuestion) {
     const content = asRecord(apiQuestion.content);

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

@@ -47,6 +47,9 @@ import { transformGNSpeakingInterview } from '../../../components/questions/type
 import { transformWordFillStructuredForm } from '../../../components/questions/types/word-fill-structured-form/transform';
 import { transformCrosswordPuzzle } from '../../../components/questions/types/crossword-puzzle/transform';
 import { transformFindWordsInMatrix } from '../../../components/questions/types/find-words-in-matrix/transform';
+import { transformMatchColumnsToMakeSentences } from '../../../components/questions/types/match-columns-to-make-sentences/transform';
+import { transformMatchWordToPictureGroup } from '../../../components/questions/types/match-word-to-picture-group/transform';
+import { transformWordOrderingGroup } from '../../../components/questions/types/word-ordering-group/transform';
 // ─── Handler map ────────────────────────────────────────────────────────────
 const questionTransformHandlers = {
     // Look picture
@@ -100,6 +103,9 @@ const questionTransformHandlers = {
     WORD_FILL_STRUCTURED_FORM: transformWordFillStructuredForm,
     CROSSWORD_PUZZLE: transformCrosswordPuzzle,
     FIND_WORDS_IN_MATRIX: transformFindWordsInMatrix,
+    MATCH_COLUMNS_TO_MAKE_SENTENCES: transformMatchColumnsToMakeSentences,
+    MATCH_WORD_TO_PICTURE_GROUP: transformMatchWordToPictureGroup,
+    WORD_ORDERING_GROUP: transformWordOrderingGroup,
 };
 /**
  * Transform frontend question format to API format.

package/dist/shared/types/common.types.d.ts

@@ -29,7 +29,7 @@ export declare enum StudentSelectionType {
 }
 export type ResultStatus = 'PENDING' | 'PARTIAL_GRADED' | 'GRADED';
 export type StudentStatus = 'NOT_STARTED' | 'IN_PROGRESS' | 'SUBMITTED';
-export type QuestionType = 'FILL_IN_BLANK' | 'TRUE_FALSE' | 'MATCHING' | 'ORDERING' | 'LISTENING' | 'COLORING' | 'ESSAY' | 'LISTEN_AND_FILL_IN_THE_BLANK_WITH_IMAGE' | 'LISTEN_AND_TICK_ANSWER' | 'LISTEN_AND_FILL_NAME_NUMBER' | 'LISTENING_FILL_BLANK' | 'LISTENING_COLOR' | 'TICK_TRUE_OR_FALSE' | 'TICK_YES_OR_NO' | 'READING_TICK_CROSS' | 'ARRANGE_LETTERS_INTO_WORDS' | 'READ_PASSAGE_AND_COMPLETE_STORY' | 'CLOZE_TEST_WITH_TICK_BOX' | 'READ_AND_CHOOSE_APPROPRIATE_WORD' | 'WRITE_SHORT_PARAGRAPH' | 'LABEL_THE_PICTURE' | 'READING_LETTER_ARRANGE' | 'READING_PASSAGE_FILL' | 'FILL_BLANK' | 'FILL_MISSING_WORDS_IN_GRID' | 'LOOK_PICTURE_CHOOSE_CORRECT_ANSWER' | 'LOOK_PICTURE_FILL_BLANK_CHOOSE_ANSWER' | 'LOOK_PICTURE_FILL_WORD_HINT' | 'LABEL_THE_PICTURE' | 'READ_AND_COLOR_OBJECTS' | 'IMAGE_OBJECT_MATCHING' | 'READ_PASSAGE_AND_ANSWER_QUESTIONS' | 'CHOOSE_THE_CORRECT_ANSWER' | 'CHOOSE_THE_CORRECT_ANSWER_GROUP' | 'TRUE_FALSE_GROUP' | 'TRUE_FALSE_CORRECT_GROUP' | 'FILL_IN_BLANK_GROUP' | 'MATCHING_WITH_LINES_GROUP' | 'CROSS_OUT_WORD_GROUP' | 'SPONTANEOUS_QA_GROUP' | 'WORD_ORDER_AND_MATCH_GROUP' | 'WRITE_A_SHORT_LETTER' | 'WRITE_CORRECT_VERB_FORM' | 'CHOOSE_CORRECT_ADJECTIVE' | 'ANSWER_THE_QUESTION' | 'ANSWER_THE_QUESTION_GROUP' | 'WORD_ORDERING' | 'WORD_FILL_PARAGRAPH' | 'MATCH_BY_WRITING_ANSWER' | 'MATCH_WORD_TO_PICTURE' | 'WRITE_SENTENCES' | 'LISTEN_AND_CHOOSE_FROM_ANSWER_GROUP' | 'LISTEN_AND_CHOOSE_OBJECTS_IN_SCENE' | 'LISTEN_AND_DRAG_OBJECTS_INTO_SCENE' | 'LISTEN_AND_SPEAK_ANSWER' | 'LISTEN_AND_SPEAK_IMAGE_GROUP' | 'LISTEN_AND_SPEAK_QUESTION_LIST' | 'LISTEN_AND_SPEAK_COMPARE_IMAGES' | 'LISTEN_AND_SPEAK_WITH_STORY_IMAGES' | 'LISTEN_AND_SPEAK_ODD_ONE_OUT' | 'LISTEN_AND_SPEAK_INFO_EXCHANGE' | 'READ_DISPLAYED_CONTENT' | 'SPEAKING_DESCRIBE_IMAGE' | 'SPONTANEOUS_QA' | 'SPEAKING_CONVERSATION' | 'GN_SPEAKING_INTERVIEW' | 'SPEAKING_CUE_CARD' | 'WORD_FILL_STRUCTURED_FORM' | 'CROSSWORD_PUZZLE' | 'FIND_WORDS_IN_MATRIX';
+export type QuestionType = 'FILL_IN_BLANK' | 'TRUE_FALSE' | 'MATCHING' | 'ORDERING' | 'LISTENING' | 'COLORING' | 'ESSAY' | 'LISTEN_AND_FILL_IN_THE_BLANK_WITH_IMAGE' | 'LISTEN_AND_TICK_ANSWER' | 'LISTEN_AND_FILL_NAME_NUMBER' | 'LISTENING_FILL_BLANK' | 'LISTENING_COLOR' | 'TICK_TRUE_OR_FALSE' | 'TICK_YES_OR_NO' | 'READING_TICK_CROSS' | 'ARRANGE_LETTERS_INTO_WORDS' | 'READ_PASSAGE_AND_COMPLETE_STORY' | 'CLOZE_TEST_WITH_TICK_BOX' | 'READ_AND_CHOOSE_APPROPRIATE_WORD' | 'WRITE_SHORT_PARAGRAPH' | 'LABEL_THE_PICTURE' | 'READING_LETTER_ARRANGE' | 'READING_PASSAGE_FILL' | 'FILL_BLANK' | 'FILL_MISSING_WORDS_IN_GRID' | 'LOOK_PICTURE_CHOOSE_CORRECT_ANSWER' | 'LOOK_PICTURE_FILL_BLANK_CHOOSE_ANSWER' | 'LOOK_PICTURE_FILL_WORD_HINT' | 'LABEL_THE_PICTURE' | 'READ_AND_COLOR_OBJECTS' | 'IMAGE_OBJECT_MATCHING' | 'READ_PASSAGE_AND_ANSWER_QUESTIONS' | 'CHOOSE_THE_CORRECT_ANSWER' | 'CHOOSE_THE_CORRECT_ANSWER_GROUP' | 'TRUE_FALSE_GROUP' | 'TRUE_FALSE_CORRECT_GROUP' | 'FILL_IN_BLANK_GROUP' | 'MATCHING_WITH_LINES_GROUP' | 'CROSS_OUT_WORD_GROUP' | 'SPONTANEOUS_QA_GROUP' | 'WORD_ORDER_AND_MATCH_GROUP' | 'WRITE_A_SHORT_LETTER' | 'WRITE_CORRECT_VERB_FORM' | 'CHOOSE_CORRECT_ADJECTIVE' | 'ANSWER_THE_QUESTION' | 'ANSWER_THE_QUESTION_GROUP' | 'WORD_ORDERING' | 'WORD_FILL_PARAGRAPH' | 'MATCH_BY_WRITING_ANSWER' | 'MATCH_WORD_TO_PICTURE' | 'WRITE_SENTENCES' | 'LISTEN_AND_CHOOSE_FROM_ANSWER_GROUP' | 'LISTEN_AND_CHOOSE_OBJECTS_IN_SCENE' | 'LISTEN_AND_DRAG_OBJECTS_INTO_SCENE' | 'LISTEN_AND_SPEAK_ANSWER' | 'LISTEN_AND_SPEAK_IMAGE_GROUP' | 'LISTEN_AND_SPEAK_QUESTION_LIST' | 'LISTEN_AND_SPEAK_COMPARE_IMAGES' | 'LISTEN_AND_SPEAK_WITH_STORY_IMAGES' | 'LISTEN_AND_SPEAK_ODD_ONE_OUT' | 'LISTEN_AND_SPEAK_INFO_EXCHANGE' | 'READ_DISPLAYED_CONTENT' | 'SPEAKING_DESCRIBE_IMAGE' | 'SPONTANEOUS_QA' | 'SPEAKING_CONVERSATION' | 'GN_SPEAKING_INTERVIEW' | 'SPEAKING_CUE_CARD' | 'WORD_FILL_STRUCTURED_FORM' | 'CROSSWORD_PUZZLE' | 'FIND_WORDS_IN_MATRIX' | 'MATCH_COLUMNS_TO_MAKE_SENTENCES' | 'MATCH_WORD_TO_PICTURE_GROUP' | 'WORD_ORDERING_GROUP';
 export type Level = 'Pre-A1' | 'A1' | 'A2' | 'B1' | 'B2' | 'C1' | 'C2';
 export type Difficulty = 'EASY' | 'MEDIUM' | 'HARD';
 export type Skill = 'LISTENING' | 'READING' | 'WRITING' | 'SPEAKING';

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

@@ -25,6 +25,7 @@ export interface ChooseTheCorrectAnswerGroupContent {
         instruction?: string;
         passage?: string;
         audioUrl?: string;
+        imageUrl?: string | string[];
     };
     items: ChooseTheCorrectAnswerGroupItem[];
 }

package/dist/shared/types/questions/index.d.ts

@@ -34,5 +34,8 @@ export * from './crossword-puzzle';
 export * from './find-words-in-matrix';
 export * from './match-word-to-picture';
 export * from './matching-with-lines-group';
+export * from './match-columns-to-make-sentences';
+export * from './match-word-to-picture-group';
+export * from './word-ordering-group';
 export * from './true-false-correct-group';
 export * from './fill-in-blank-group';