@tinyweb_dev/oe-exam-sdk 0.2.8 → 0.2.10

package/dist/shared/lib/validation/choose-correct-answer.validation.js

@@ -1,4 +1,5 @@
 import { z } from 'zod';
+import { isRichTextEmpty } from '../../lib/rich-text';
 // Validation schema for Choose the Correct Answer form
 export const chooseCorrectAnswerFormSchema = z.object({
     question: z.string().optional(),
@@ -35,7 +36,8 @@ export const chooseCorrectAnswerFormSchema = z.object({
     })
         .pipe(z.number().min(1, 'Điểm số phải >= 1')),
 }).superRefine((data, ctx) => {
-    const filledOptions = data.options.filter((opt) => opt.trim() !== '');
+    const isOptionFilled = (opt) => data.optionType === 'image' ? opt.trim() !== '' : !isRichTextEmpty(opt);
+    const filledOptions = data.options.filter((opt) => isOptionFilled(opt));
     if (filledOptions.length < 2) {
         ctx.addIssue({
             code: z.ZodIssueCode.custom,
@@ -47,7 +49,7 @@ export const chooseCorrectAnswerFormSchema = z.object({
     }
     // Validate each option based on type
     data.options.forEach((opt, index) => {
-        if (opt.trim() === '') {
+        if (!isOptionFilled(opt)) {
             ctx.addIssue({
                 code: z.ZodIssueCode.custom,
                 message: data.optionType === 'image'

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';

package/dist/shared/types/questions/index.js

@@ -54,6 +54,12 @@ export * from './find-words-in-matrix';
 export * from './match-word-to-picture';
 // MATCHING_WITH_LINES_GROUP
 export * from './matching-with-lines-group';
+// MATCH_COLUMNS_TO_MAKE_SENTENCES
+export * from './match-columns-to-make-sentences';
+// MATCH_WORD_TO_PICTURE_GROUP
+export * from './match-word-to-picture-group';
+// WORD_ORDERING_GROUP
+export * from './word-ordering-group';
 // TRUE_FALSE_CORRECT_GROUP
 export * from './true-false-correct-group';
 // FILL_IN_BLANK_GROUP

package/dist/shared/types/questions/match-columns-to-make-sentences.d.ts

@@ -0,0 +1,50 @@
+export declare const MATCH_COLUMNS_TO_MAKE_SENTENCE_ITEM_TYPE: "MATCH_COLUMNS_TO_MAKE_SENTENCE";
+export interface MatchColumnsFragment {
+    id: string;
+    text: string;
+}
+export interface MatchColumnsColumn {
+    id: string;
+    label?: string;
+    role: 'stem' | 'choice';
+    fragments: MatchColumnsFragment[];
+}
+export interface MatchColumnsItemAnswer {
+    fragmentIds: string[];
+    sentence: string;
+}
+export interface MatchColumnsGroupItemContent {
+    stemFragmentId: string;
+}
+export interface MatchColumnsGroupItem {
+    questionType?: typeof MATCH_COLUMNS_TO_MAKE_SENTENCE_ITEM_TYPE;
+    isExample?: boolean;
+    content: MatchColumnsGroupItemContent;
+    correctAnswer?: {
+        answer: MatchColumnsItemAnswer;
+    };
+    points?: number;
+    questionNumber?: number;
+}
+export interface MatchColumnsGroupContent {
+    meta?: {
+        title?: string;
+        instruction?: string;
+    };
+    columns: MatchColumnsColumn[];
+    items: MatchColumnsGroupItem[];
+}
+export interface MatchColumnsGroupCorrectAnswer {
+    answer: MatchColumnsItemAnswer[];
+}
+export interface MatchColumnsGroupAPIPayload {
+    id?: string;
+    questionType: 'MATCH_COLUMNS_TO_MAKE_SENTENCES';
+    content: MatchColumnsGroupContent;
+    correctAnswer: MatchColumnsGroupCorrectAnswer;
+    points: number;
+    explanation?: string;
+    questionNumber: number;
+    partId?: string;
+    partNo?: number;
+}

package/dist/shared/types/questions/match-columns-to-make-sentences.js

@@ -0,0 +1 @@
+export const MATCH_COLUMNS_TO_MAKE_SENTENCE_ITEM_TYPE = 'MATCH_COLUMNS_TO_MAKE_SENTENCE';

package/dist/shared/types/questions/match-word-to-picture-group.d.ts

@@ -0,0 +1,31 @@
+export declare const MATCH_WORD_TO_PICTURE_ITEM_TYPE: "MATCH_WORD_TO_PICTURE";
+export interface MatchWordToPictureGroupItem {
+    questionType?: typeof MATCH_WORD_TO_PICTURE_ITEM_TYPE;
+    isExample?: boolean;
+    content: {
+        imageUrl: string;
+    };
+    correctAnswer?: {
+        answer: string;
+    };
+    points?: number;
+    questionNumber?: number;
+}
+export interface MatchWordToPictureGroupContent {
+    meta?: {
+        instruction?: string;
+        wordBank?: string[];
+    };
+    items: MatchWordToPictureGroupItem[];
+}
+export interface MatchWordToPictureGroupAPIPayload {
+    id?: string;
+    questionType: 'MATCH_WORD_TO_PICTURE_GROUP';
+    content: MatchWordToPictureGroupContent;
+    correctAnswer: {
+        answer: string[];
+    };
+    points: number;
+    explanation?: string;
+    questionNumber: number;
+}

package/dist/shared/types/questions/match-word-to-picture-group.js

@@ -0,0 +1 @@
+export const MATCH_WORD_TO_PICTURE_ITEM_TYPE = 'MATCH_WORD_TO_PICTURE';

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

@@ -0,0 +1,28 @@
+export declare const WORD_ORDERING_ITEM_TYPE: "WORD_ORDERING";
+export interface WordOrderingGroupItem {
+    questionType?: typeof WORD_ORDERING_ITEM_TYPE;
+    isExample?: boolean;
+    content: {
+        words: string[];
+    };
+    correctAnswer?: {
+        answer: string[];
+    };
+    points?: number;
+    questionNumber?: number;
+}
+export interface WordOrderingGroupAPIPayload {
+    questionType: 'WORD_ORDERING_GROUP';
+    content: {
+        meta?: {
+            instruction?: string;
+        };
+        items: WordOrderingGroupItem[];
+    };
+    correctAnswer: {
+        answer: string[][];
+    };
+    points: number;
+    explanation?: string;
+    questionNumber: number;
+}

package/dist/shared/types/questions/word-ordering-group.js

@@ -0,0 +1 @@
+export const WORD_ORDERING_ITEM_TYPE = 'WORD_ORDERING';

package/package.json

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