@quesmed/types 2.5.35 → 2.5.37

package/dist/cjs/index.d.ts

@@ -8,6 +8,20 @@ export declare const ERRORS: {
     SUBSCRIPTION_EXPIRED: string;
     PERMISSION_INVALID: string;
 };
+export declare enum EGrammarType {
+    QUESTION = 0,
+    CARD = 1,
+    CONCEPT = 2,
+    PSA_MULTI_QA = 3,
+    PSA_PRESCRIBE = 4,
+    PSA_QA = 5,
+    PSA_SBA = 6,
+    OSCE = 7,
+    BOOK = 8,
+    EMQ_QUESTION = 9,
+    SJT_QUESTION = 10,
+    RA_QUESTION = 11
+}
 export declare const FCM_TOPICS: {
     GLOBAL: string;
     QBANK: string;

package/dist/cjs/index.js

@@ -26,7 +26,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDisplayName = exports.medicalWords = exports.termsAndConditions = exports.EPlatformId = exports.FCM_TOPICS = exports.ERRORS = exports.utils = exports.Models = void 0;
+exports.generateDisplayName = exports.medicalWords = exports.termsAndConditions = exports.EPlatformId = exports.FCM_TOPICS = exports.EGrammarType = exports.ERRORS = exports.utils = exports.Models = void 0;
 const random_1 = require("./utils/random");
 exports.Models = __importStar(require("./models"));
 __exportStar(require("./resolvers"), exports);
@@ -38,6 +38,21 @@ exports.ERRORS = {
     SUBSCRIPTION_EXPIRED: 'Expired subscription.',
     PERMISSION_INVALID: 'Invalid permission.',
 };
+var EGrammarType;
+(function (EGrammarType) {
+    EGrammarType[EGrammarType["QUESTION"] = 0] = "QUESTION";
+    EGrammarType[EGrammarType["CARD"] = 1] = "CARD";
+    EGrammarType[EGrammarType["CONCEPT"] = 2] = "CONCEPT";
+    EGrammarType[EGrammarType["PSA_MULTI_QA"] = 3] = "PSA_MULTI_QA";
+    EGrammarType[EGrammarType["PSA_PRESCRIBE"] = 4] = "PSA_PRESCRIBE";
+    EGrammarType[EGrammarType["PSA_QA"] = 5] = "PSA_QA";
+    EGrammarType[EGrammarType["PSA_SBA"] = 6] = "PSA_SBA";
+    EGrammarType[EGrammarType["OSCE"] = 7] = "OSCE";
+    EGrammarType[EGrammarType["BOOK"] = 8] = "BOOK";
+    EGrammarType[EGrammarType["EMQ_QUESTION"] = 9] = "EMQ_QUESTION";
+    EGrammarType[EGrammarType["SJT_QUESTION"] = 10] = "SJT_QUESTION";
+    EGrammarType[EGrammarType["RA_QUESTION"] = 11] = "RA_QUESTION";
+})(EGrammarType = exports.EGrammarType || (exports.EGrammarType = {}));
 exports.FCM_TOPICS = {
     GLOBAL: 'global',
     QBANK: 'qbank',

package/dist/cjs/models/Question.d.ts

@@ -18,7 +18,12 @@ export declare enum EQuestionType {
     SINGLE_BEST_ANSWER = 1,
     QUESTION_ANSWER = 2,
     MULTIPLE_ANSWERS = 3,
-    PRESCRIPTION_ANSWER = 4
+    PRESCRIPTION_ANSWER = 4,
+    EXTENDED_MATCHING_ANSWER = 5,
+    SELECT_THREE_ANSWER = 6,
+    RANKING_ANSWER = 7,
+    MRCP_PART_1 = 8,
+    MRCP_PART_2 = 9
 }
 export declare enum EQuestionLike {
     NONE = 0,
@@ -53,8 +58,8 @@ export interface IQuestionCommentLike {
     comment: IQuestionComment;
     likeTrueDislikeFalse: boolean;
 }
-export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeAnswer[];
-export type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe;
+export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeAnswer[] | [string, string][] | [string, string, string] | string[];
+export type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe | IQuestionEMQ | IQuestionSelect3 | IQuestionRanking;
 export interface IQuestion {
     id: Id;
     createdAt: Date | number;
@@ -70,6 +75,7 @@ export interface IQuestion {
     answer: IQuestionAnswer;
     totalVotes: number;
     choices: IQuestionChoice[];
+    cases?: IQuestionCase[];
     topic?: ITopic;
     pictures?: IPicture[];
     difficulty: EDifficultyType;
@@ -111,6 +117,14 @@ export interface IQuestionChoice {
     votes: number;
     picture?: IPicture | null;
 }
+export interface IQuestionCase {
+    id: Id;
+    updatedAt: number | Date;
+    questionId: Id;
+    case: string;
+    explanation: string;
+    label: string;
+}
 export interface IQuestionElo {
     id: Id;
     date: number | Date;
@@ -145,10 +159,25 @@ export interface IQuestionQA extends IQuestion {
     qaAnswer: [IQuestionQAAnswer];
 }
 export declare function isQuestionMultiQ(data: IQuestionAll): data is IQuestionMultiQ;
+export declare function isQuestionEMQ(data: IQuestionAll): data is IQuestionEMQ;
+export declare function isQuestionSelect3(data: IQuestionAll): data is IQuestionSelect3;
+export declare function isQuestionRanking(data: IQuestionAll): data is IQuestionRanking;
 export interface IQuestionMultiQ extends IQuestion {
     answer: [string[], string[]];
     multiAnswer: [string[], string[]];
 }
+export interface IQuestionEMQ extends IQuestion {
+    answer: [string, string][];
+    emqAnswer: [string, string][];
+}
+export interface IQuestionSelect3 extends IQuestion {
+    answer: [string, string, string];
+    answerSelect3: [string, string, string];
+}
+export interface IQuestionRanking extends IQuestion {
+    answer: string[];
+    answerRanking: string[];
+}
 export declare function isQuestionPrescribe(data: IQuestionAll): data is IQuestionPrescribe;
 export interface IQuestionPrescribe extends IQuestion {
     answer: IPrescribeAnswer[];

package/dist/cjs/models/Question.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isQuestionPrescribe = exports.isQuestionMultiQ = exports.isQuestionQA = exports.isQuestionSBA = exports.EQuestionLike = exports.EQuestionType = exports.EPsaSectionType = void 0;
+exports.isQuestionPrescribe = exports.isQuestionRanking = exports.isQuestionSelect3 = exports.isQuestionEMQ = exports.isQuestionMultiQ = exports.isQuestionQA = exports.isQuestionSBA = exports.EQuestionLike = exports.EQuestionType = exports.EPsaSectionType = void 0;
 var EPsaSectionType;
 (function (EPsaSectionType) {
     EPsaSectionType[EPsaSectionType["PRESCRIBING"] = 1] = "PRESCRIBING";
@@ -18,6 +18,11 @@ var EQuestionType;
     EQuestionType[EQuestionType["QUESTION_ANSWER"] = 2] = "QUESTION_ANSWER";
     EQuestionType[EQuestionType["MULTIPLE_ANSWERS"] = 3] = "MULTIPLE_ANSWERS";
     EQuestionType[EQuestionType["PRESCRIPTION_ANSWER"] = 4] = "PRESCRIPTION_ANSWER";
+    EQuestionType[EQuestionType["EXTENDED_MATCHING_ANSWER"] = 5] = "EXTENDED_MATCHING_ANSWER";
+    EQuestionType[EQuestionType["SELECT_THREE_ANSWER"] = 6] = "SELECT_THREE_ANSWER";
+    EQuestionType[EQuestionType["RANKING_ANSWER"] = 7] = "RANKING_ANSWER";
+    EQuestionType[EQuestionType["MRCP_PART_1"] = 8] = "MRCP_PART_1";
+    EQuestionType[EQuestionType["MRCP_PART_2"] = 9] = "MRCP_PART_2";
 })(EQuestionType = exports.EQuestionType || (exports.EQuestionType = {}));
 var EQuestionLike;
 (function (EQuestionLike) {
@@ -37,6 +42,18 @@ function isQuestionMultiQ(data) {
     return data.typeId === EQuestionType.MULTIPLE_ANSWERS;
 }
 exports.isQuestionMultiQ = isQuestionMultiQ;
+function isQuestionEMQ(data) {
+    return data.typeId === EQuestionType.EXTENDED_MATCHING_ANSWER;
+}
+exports.isQuestionEMQ = isQuestionEMQ;
+function isQuestionSelect3(data) {
+    return data.typeId === EQuestionType.SELECT_THREE_ANSWER;
+}
+exports.isQuestionSelect3 = isQuestionSelect3;
+function isQuestionRanking(data) {
+    return data.typeId === EQuestionType.RANKING_ANSWER;
+}
+exports.isQuestionRanking = isQuestionRanking;
 function isQuestionPrescribe(data) {
     return data.typeId === EQuestionType.PRESCRIPTION_ANSWER;
 }

package/dist/cjs/resolvers/query/restricted/video.js

@@ -47,6 +47,7 @@ exports.VIDEO = (0, client_1.gql) `
           candidateBrief
           examinerBrief
           actorBrief
+          explanation
           marks {
             id
             index

package/dist/cjs/resolvers/query/video.js

@@ -104,6 +104,7 @@ exports.SAMPLE_VIDEO = (0, client_1.gql) `
         candidateBrief
         examinerBrief
         actorBrief
+        explanation
         marks {
           id
           index

package/dist/cjs/utils/commonFunctions.js

@@ -140,6 +140,15 @@ function formatPrescribeAnswer(baseAnswer) {
     return obj;
 }
 exports.formatPrescribeAnswer = formatPrescribeAnswer;
+function createHashMap(arr) {
+    const map = new Map();
+    for (const innerArr of arr) {
+        const sortedInnerArr = innerArr.slice().sort();
+        const key = sortedInnerArr.join('|');
+        map.set(key, (map.get(key) || 0) + 1);
+    }
+    return map;
+}
 function correctMark(mark) {
     const data = {
         correct: false,
@@ -246,6 +255,65 @@ function correctMark(mark) {
                 data.incorrect = true;
             }
         }
+        else if (models_1.EQuestionType.EXTENDED_MATCHING_ANSWER === mark.question.typeId) {
+            const extendedAnswer = answer;
+            const attempt = jsonAnswer;
+            if (extendedAnswer.length !== attempt.length) {
+                data.incorrect = true;
+            }
+            else {
+                const map1 = createHashMap(extendedAnswer);
+                const map2 = createHashMap(attempt);
+                for (const [key, value] of map1) {
+                    if (map2.get(key) !== value) {
+                        data.incorrect = true;
+                        break;
+                    }
+                }
+                if (!data.incorrect) {
+                    data.correct = true;
+                }
+            }
+        }
+        else if (models_1.EQuestionType.SELECT_THREE_ANSWER === mark.question.typeId) {
+            const threeAnswer = answer;
+            const attempt = jsonAnswer;
+            if (threeAnswer.length !== 3) {
+                data.incorrect = true;
+            }
+            else {
+                const answerSet = new Set(threeAnswer);
+                for (const attemptLabel of attempt) {
+                    if (!answerSet.has(attemptLabel)) {
+                        data.incorrect = true;
+                        break;
+                    }
+                }
+                if (!data.incorrect) {
+                    data.correct = true;
+                }
+            }
+        }
+        else if (models_1.EQuestionType.RANKING_ANSWER === mark.question.typeId) {
+            // Duplicate logic to Extended Matching, but they have different scoring systems
+            // which we may add at a later point
+            const rankAnswer = answer;
+            const attempt = jsonAnswer;
+            if (rankAnswer.length !== attempt.length) {
+                data.incorrect = true;
+            }
+            else {
+                for (let i = 0; i < rankAnswer.length; i++) {
+                    if (rankAnswer[i] !== attempt[i]) {
+                        data.incorrect = true;
+                        break;
+                    }
+                }
+                if (!data.incorrect) {
+                    data.correct = true;
+                }
+            }
+        }
     }
     catch (e) {
         console.error(e);

package/dist/mjs/index.d.ts

@@ -8,6 +8,20 @@ export declare const ERRORS: {
     SUBSCRIPTION_EXPIRED: string;
     PERMISSION_INVALID: string;
 };
+export declare enum EGrammarType {
+    QUESTION = 0,
+    CARD = 1,
+    CONCEPT = 2,
+    PSA_MULTI_QA = 3,
+    PSA_PRESCRIBE = 4,
+    PSA_QA = 5,
+    PSA_SBA = 6,
+    OSCE = 7,
+    BOOK = 8,
+    EMQ_QUESTION = 9,
+    SJT_QUESTION = 10,
+    RA_QUESTION = 11
+}
 export declare const FCM_TOPICS: {
     GLOBAL: string;
     QBANK: string;

package/dist/mjs/index.js

@@ -9,6 +9,21 @@ export const ERRORS = {
     SUBSCRIPTION_EXPIRED: 'Expired subscription.',
     PERMISSION_INVALID: 'Invalid permission.',
 };
+export var EGrammarType;
+(function (EGrammarType) {
+    EGrammarType[EGrammarType["QUESTION"] = 0] = "QUESTION";
+    EGrammarType[EGrammarType["CARD"] = 1] = "CARD";
+    EGrammarType[EGrammarType["CONCEPT"] = 2] = "CONCEPT";
+    EGrammarType[EGrammarType["PSA_MULTI_QA"] = 3] = "PSA_MULTI_QA";
+    EGrammarType[EGrammarType["PSA_PRESCRIBE"] = 4] = "PSA_PRESCRIBE";
+    EGrammarType[EGrammarType["PSA_QA"] = 5] = "PSA_QA";
+    EGrammarType[EGrammarType["PSA_SBA"] = 6] = "PSA_SBA";
+    EGrammarType[EGrammarType["OSCE"] = 7] = "OSCE";
+    EGrammarType[EGrammarType["BOOK"] = 8] = "BOOK";
+    EGrammarType[EGrammarType["EMQ_QUESTION"] = 9] = "EMQ_QUESTION";
+    EGrammarType[EGrammarType["SJT_QUESTION"] = 10] = "SJT_QUESTION";
+    EGrammarType[EGrammarType["RA_QUESTION"] = 11] = "RA_QUESTION";
+})(EGrammarType || (EGrammarType = {}));
 export const FCM_TOPICS = {
     GLOBAL: 'global',
     QBANK: 'qbank',

package/dist/mjs/models/Question.d.ts

@@ -18,7 +18,12 @@ export declare enum EQuestionType {
     SINGLE_BEST_ANSWER = 1,
     QUESTION_ANSWER = 2,
     MULTIPLE_ANSWERS = 3,
-    PRESCRIPTION_ANSWER = 4
+    PRESCRIPTION_ANSWER = 4,
+    EXTENDED_MATCHING_ANSWER = 5,
+    SELECT_THREE_ANSWER = 6,
+    RANKING_ANSWER = 7,
+    MRCP_PART_1 = 8,
+    MRCP_PART_2 = 9
 }
 export declare enum EQuestionLike {
     NONE = 0,
@@ -53,8 +58,8 @@ export interface IQuestionCommentLike {
     comment: IQuestionComment;
     likeTrueDislikeFalse: boolean;
 }
-export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeAnswer[];
-export type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe;
+export type IQuestionAnswer = string | [string] | [IQuestionQAAnswer] | [string[], string[]] | IPrescribeAnswer[] | [string, string][] | [string, string, string] | string[];
+export type IQuestionAll = IQuestion | IQuestionSBA | IQuestionQA | IQuestionMultiQ | IQuestionPrescribe | IQuestionEMQ | IQuestionSelect3 | IQuestionRanking;
 export interface IQuestion {
     id: Id;
     createdAt: Date | number;
@@ -70,6 +75,7 @@ export interface IQuestion {
     answer: IQuestionAnswer;
     totalVotes: number;
     choices: IQuestionChoice[];
+    cases?: IQuestionCase[];
     topic?: ITopic;
     pictures?: IPicture[];
     difficulty: EDifficultyType;
@@ -111,6 +117,14 @@ export interface IQuestionChoice {
     votes: number;
     picture?: IPicture | null;
 }
+export interface IQuestionCase {
+    id: Id;
+    updatedAt: number | Date;
+    questionId: Id;
+    case: string;
+    explanation: string;
+    label: string;
+}
 export interface IQuestionElo {
     id: Id;
     date: number | Date;
@@ -145,10 +159,25 @@ export interface IQuestionQA extends IQuestion {
     qaAnswer: [IQuestionQAAnswer];
 }
 export declare function isQuestionMultiQ(data: IQuestionAll): data is IQuestionMultiQ;
+export declare function isQuestionEMQ(data: IQuestionAll): data is IQuestionEMQ;
+export declare function isQuestionSelect3(data: IQuestionAll): data is IQuestionSelect3;
+export declare function isQuestionRanking(data: IQuestionAll): data is IQuestionRanking;
 export interface IQuestionMultiQ extends IQuestion {
     answer: [string[], string[]];
     multiAnswer: [string[], string[]];
 }
+export interface IQuestionEMQ extends IQuestion {
+    answer: [string, string][];
+    emqAnswer: [string, string][];
+}
+export interface IQuestionSelect3 extends IQuestion {
+    answer: [string, string, string];
+    answerSelect3: [string, string, string];
+}
+export interface IQuestionRanking extends IQuestion {
+    answer: string[];
+    answerRanking: string[];
+}
 export declare function isQuestionPrescribe(data: IQuestionAll): data is IQuestionPrescribe;
 export interface IQuestionPrescribe extends IQuestion {
     answer: IPrescribeAnswer[];

package/dist/mjs/models/Question.js

@@ -15,6 +15,11 @@ export var EQuestionType;
     EQuestionType[EQuestionType["QUESTION_ANSWER"] = 2] = "QUESTION_ANSWER";
     EQuestionType[EQuestionType["MULTIPLE_ANSWERS"] = 3] = "MULTIPLE_ANSWERS";
     EQuestionType[EQuestionType["PRESCRIPTION_ANSWER"] = 4] = "PRESCRIPTION_ANSWER";
+    EQuestionType[EQuestionType["EXTENDED_MATCHING_ANSWER"] = 5] = "EXTENDED_MATCHING_ANSWER";
+    EQuestionType[EQuestionType["SELECT_THREE_ANSWER"] = 6] = "SELECT_THREE_ANSWER";
+    EQuestionType[EQuestionType["RANKING_ANSWER"] = 7] = "RANKING_ANSWER";
+    EQuestionType[EQuestionType["MRCP_PART_1"] = 8] = "MRCP_PART_1";
+    EQuestionType[EQuestionType["MRCP_PART_2"] = 9] = "MRCP_PART_2";
 })(EQuestionType || (EQuestionType = {}));
 export var EQuestionLike;
 (function (EQuestionLike) {
@@ -31,6 +36,15 @@ export function isQuestionQA(data) {
 export function isQuestionMultiQ(data) {
     return data.typeId === EQuestionType.MULTIPLE_ANSWERS;
 }
+export function isQuestionEMQ(data) {
+    return data.typeId === EQuestionType.EXTENDED_MATCHING_ANSWER;
+}
+export function isQuestionSelect3(data) {
+    return data.typeId === EQuestionType.SELECT_THREE_ANSWER;
+}
+export function isQuestionRanking(data) {
+    return data.typeId === EQuestionType.RANKING_ANSWER;
+}
 export function isQuestionPrescribe(data) {
     return data.typeId === EQuestionType.PRESCRIPTION_ANSWER;
 }

package/dist/mjs/resolvers/query/restricted/video.js

@@ -44,6 +44,7 @@ export const VIDEO = gql `
           candidateBrief
           examinerBrief
           actorBrief
+          explanation
           marks {
             id
             index

package/dist/mjs/resolvers/query/video.js

@@ -101,6 +101,7 @@ export const SAMPLE_VIDEO = gql `
         candidateBrief
         examinerBrief
         actorBrief
+        explanation
         marks {
           id
           index

package/dist/mjs/utils/commonFunctions.js

@@ -135,6 +135,15 @@ export function formatPrescribeAnswer(baseAnswer) {
     }
     return obj;
 }
+function createHashMap(arr) {
+    const map = new Map();
+    for (const innerArr of arr) {
+        const sortedInnerArr = innerArr.slice().sort();
+        const key = sortedInnerArr.join('|');
+        map.set(key, (map.get(key) || 0) + 1);
+    }
+    return map;
+}
 export function correctMark(mark) {
     const data = {
         correct: false,
@@ -241,6 +250,65 @@ export function correctMark(mark) {
                 data.incorrect = true;
             }
         }
+        else if (EQuestionType.EXTENDED_MATCHING_ANSWER === mark.question.typeId) {
+            const extendedAnswer = answer;
+            const attempt = jsonAnswer;
+            if (extendedAnswer.length !== attempt.length) {
+                data.incorrect = true;
+            }
+            else {
+                const map1 = createHashMap(extendedAnswer);
+                const map2 = createHashMap(attempt);
+                for (const [key, value] of map1) {
+                    if (map2.get(key) !== value) {
+                        data.incorrect = true;
+                        break;
+                    }
+                }
+                if (!data.incorrect) {
+                    data.correct = true;
+                }
+            }
+        }
+        else if (EQuestionType.SELECT_THREE_ANSWER === mark.question.typeId) {
+            const threeAnswer = answer;
+            const attempt = jsonAnswer;
+            if (threeAnswer.length !== 3) {
+                data.incorrect = true;
+            }
+            else {
+                const answerSet = new Set(threeAnswer);
+                for (const attemptLabel of attempt) {
+                    if (!answerSet.has(attemptLabel)) {
+                        data.incorrect = true;
+                        break;
+                    }
+                }
+                if (!data.incorrect) {
+                    data.correct = true;
+                }
+            }
+        }
+        else if (EQuestionType.RANKING_ANSWER === mark.question.typeId) {
+            // Duplicate logic to Extended Matching, but they have different scoring systems
+            // which we may add at a later point
+            const rankAnswer = answer;
+            const attempt = jsonAnswer;
+            if (rankAnswer.length !== attempt.length) {
+                data.incorrect = true;
+            }
+            else {
+                for (let i = 0; i < rankAnswer.length; i++) {
+                    if (rankAnswer[i] !== attempt[i]) {
+                        data.incorrect = true;
+                        break;
+                    }
+                }
+                if (!data.incorrect) {
+                    data.correct = true;
+                }
+            }
+        }
     }
     catch (e) {
         console.error(e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "2.5.35",
+  "version": "2.5.37",
   "description": "Typescript types for Quesmed",
   "keywords": [
     "quesmed",