@quesmed/types 1.4.9 → 1.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quesmed/types",
-  "version": "1.4.9",
+  "version": "1.4.13",
   "description": "Typescript types for Quesmed",
   "main": "index.js",
   "module": "index.mjs",

package/resolvers/fragments/osce.js

@@ -98,7 +98,6 @@ exports.OSCE_MARKSHEET_MARK_FIELDS = (0, client_1.gql) `
   }
 `;
 exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
-  ${exports.OSCE_STATION_FIELDS}
   ${exports.OSCE_MARKSHEET_MARK_FIELDS}
   ${exports.OSCE_MARKSHEET_USER_FIELDS}
   fragment OsceMarksheetFields on OsceMarksheet {
@@ -107,9 +106,6 @@ exports.OSCE_MARKSHEET_FIELDS = (0, client_1.gql) `
     updatedAt
     timeTaken
     osceStationId
-    osceStation {
-      ...OsceStationFields
-    }
     userId
     solo
     role

package/resolvers/fragments/osce.mjs

@@ -95,7 +95,6 @@ export const OSCE_MARKSHEET_MARK_FIELDS = gql `
   }
 `;
 export const OSCE_MARKSHEET_FIELDS = gql `
-  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_MARK_FIELDS}
   ${OSCE_MARKSHEET_USER_FIELDS}
   fragment OsceMarksheetFields on OsceMarksheet {
@@ -104,9 +103,6 @@ export const OSCE_MARKSHEET_FIELDS = gql `
     updatedAt
     timeTaken
     osceStationId
-    osceStation {
-      ...OsceStationFields
-    }
     userId
     solo
     role

package/resolvers/mutation/restricted/osce.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LEAVE_OSCE_MARKSHEET = exports.END_OSCE_MARKSHEET = exports.OSCE_MARKSHEET_ACTIONS = exports.SAVE_OSCE_MARKSHEET = exports.PRESTART_OSCE_MARKSHEET = exports.START_OSCE_MARKSHEET = exports.SELECT_OSCE_STATION = exports.optimisticMarkOsceMarksheetMark = exports.MARK_OSCE_MARKSHEET_MARK = exports.CHANGE_OSCE_ROLE = exports.BUILD_OSCE_MARKSHEET = exports.CANCEL_OSCE_MATCHMAKING = exports.CHECK_OSCE_MATCHMAKING = exports.ACCEPT_OSCE_MATCHMAKING = exports.START_OSCE_MATCHMAKING = void 0;
 const client_1 = require("@apollo/client");
 const osce_1 = require("../../fragments/osce");
+const osce_2 = require("./../../fragments/osce");
 exports.START_OSCE_MATCHMAKING = (0, client_1.gql) `
   mutation StartOsceMatchmaking($agoraId: String!) {
     restricted {
@@ -35,6 +36,7 @@ exports.CANCEL_OSCE_MATCHMAKING = (0, client_1.gql) `
   }
 `;
 exports.BUILD_OSCE_MARKSHEET = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   mutation BuildOsceMarksheet(
     $osceStationId: Int
@@ -48,6 +50,9 @@ exports.BUILD_OSCE_MARKSHEET = (0, client_1.gql) `
         solo: $solo
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
@@ -88,6 +93,7 @@ const optimisticMarkOsceMarksheetMark = (variables) => {
 };
 exports.optimisticMarkOsceMarksheetMark = optimisticMarkOsceMarksheetMark;
 exports.SELECT_OSCE_STATION = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   mutation SelectOsceMarksheetStation(
     $osceMarksheetId: Int!
@@ -99,21 +105,29 @@ exports.SELECT_OSCE_STATION = (0, client_1.gql) `
         osceStationId: $osceStationId
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 exports.START_OSCE_MARKSHEET = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   mutation StartOsceMarksheet($osceMarksheetId: Int!) {
     restricted {
       startOsceMarksheet(osceMarksheetId: $osceMarksheetId) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 exports.PRESTART_OSCE_MARKSHEET = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   mutation PrestartOsceMarksheet(
     $osceMarksheetId: Int!
@@ -129,6 +143,9 @@ exports.PRESTART_OSCE_MARKSHEET = (0, client_1.gql) `
         feedbackTime: $feedbackTime
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }

package/resolvers/mutation/restricted/osce.mjs

@@ -1,5 +1,6 @@
 import { gql } from '@apollo/client';
 import { OSCE_MARKSHEET_FIELDS, OSCE_MATCHMAKING_ACTION_FIELDS, } from '../../fragments/osce';
+import { OSCE_STATION_FIELDS } from './../../fragments/osce';
 export const START_OSCE_MATCHMAKING = gql `
   mutation StartOsceMatchmaking($agoraId: String!) {
     restricted {
@@ -32,6 +33,7 @@ export const CANCEL_OSCE_MATCHMAKING = gql `
   }
 `;
 export const BUILD_OSCE_MARKSHEET = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   mutation BuildOsceMarksheet(
     $osceStationId: Int
@@ -45,6 +47,9 @@ export const BUILD_OSCE_MARKSHEET = gql `
         solo: $solo
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
@@ -84,6 +89,7 @@ export const optimisticMarkOsceMarksheetMark = (variables) => {
     };
 };
 export const SELECT_OSCE_STATION = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   mutation SelectOsceMarksheetStation(
     $osceMarksheetId: Int!
@@ -95,21 +101,29 @@ export const SELECT_OSCE_STATION = gql `
         osceStationId: $osceStationId
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 export const START_OSCE_MARKSHEET = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   mutation StartOsceMarksheet($osceMarksheetId: Int!) {
     restricted {
       startOsceMarksheet(osceMarksheetId: $osceMarksheetId) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 export const PRESTART_OSCE_MARKSHEET = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   mutation PrestartOsceMarksheet(
     $osceMarksheetId: Int!
@@ -125,6 +139,9 @@ export const PRESTART_OSCE_MARKSHEET = gql `
         feedbackTime: $feedbackTime
       ) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }

package/resolvers/query/restricted/osce.js

@@ -25,21 +25,29 @@ exports.DASHBOARD_OSCE = (0, client_1.gql) `
   }
 `;
 exports.OSCE_MARKSHEETS = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   query OsceMarksheets($solo: Boolean!) {
     restricted {
       osceMarksheets(solo: $solo) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 exports.OSCE_MARKSHEET = (0, client_1.gql) `
+  ${osce_2.OSCE_STATION_FIELDS}
   ${osce_1.OSCE_MARKSHEET_FIELDS}
   query OsceMarksheet($id: Int!) {
     restricted {
       osceMarksheet(id: $id) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
@@ -62,6 +70,8 @@ exports.OSCE_STATIONS = (0, client_1.gql) `
         topicIds: $topicIds
       ) {
         ...OsceStationFields
+        attempted
+        score
       }
     }
   }
@@ -92,6 +102,8 @@ exports.SEARCH_OSCE_STATIONS = (0, client_1.gql) `
     restricted {
       searchOsceStations(search: $search) {
         ...OsceStationFields
+        attempted
+        score
       }
     }
   }

package/resolvers/query/restricted/osce.mjs

@@ -22,21 +22,29 @@ export const DASHBOARD_OSCE = gql `
   }
 `;
 export const OSCE_MARKSHEETS = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   query OsceMarksheets($solo: Boolean!) {
     restricted {
       osceMarksheets(solo: $solo) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
 `;
 export const OSCE_MARKSHEET = gql `
+  ${OSCE_STATION_FIELDS}
   ${OSCE_MARKSHEET_FIELDS}
   query OsceMarksheet($id: Int!) {
     restricted {
       osceMarksheet(id: $id) {
         ...OsceMarksheetFields
+        osceStation {
+          ...OsceStationFields
+        }
       }
     }
   }
@@ -59,6 +67,8 @@ export const OSCE_STATIONS = gql `
         topicIds: $topicIds
       ) {
         ...OsceStationFields
+        attempted
+        score
       }
     }
   }
@@ -89,6 +99,8 @@ export const SEARCH_OSCE_STATIONS = gql `
     restricted {
       searchOsceStations(search: $search) {
         ...OsceStationFields
+        attempted
+        score
       }
     }
   }

package/utils/commonFunctions.d.ts

@@ -1,6 +1,6 @@
 import { IMarksheetMark, IPrescribeAnswer, IPrescribeMark } from '../models';
 export declare function mapPrescribeMarkToAnswer(obj: IPrescribeMark): IPrescribeAnswer;
-export declare function formatPrescribeAnswer(obj: IPrescribeAnswer): IPrescribeAnswer;
+export declare function formatPrescribeAnswer(baseAnswer: IPrescribeAnswer): IPrescribeAnswer;
 export interface ICorrectMarkData {
     correct: boolean;
     incorrect: boolean;

package/utils/commonFunctions.js

@@ -34,7 +34,8 @@ function mapPrescribeMarkToAnswer(obj) {
     };
 }
 exports.mapPrescribeMarkToAnswer = mapPrescribeMarkToAnswer;
-function formatPrescribeAnswer(obj) {
+function formatPrescribeAnswer(baseAnswer) {
+    const obj = Object.assign(Object.assign({}, baseAnswer), { drug: Object.assign({}, baseAnswer.drug), dose: Object.assign({}, baseAnswer.dose), units: Object.assign({}, baseAnswer.units), route: Object.assign({}, baseAnswer.route), frequency: Object.assign({}, baseAnswer.frequency), duration: Object.assign({}, baseAnswer.duration) });
     obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
     obj.route.value = obj.route.value
         .toLowerCase()

package/utils/commonFunctions.mjs

@@ -30,7 +30,8 @@ export function mapPrescribeMarkToAnswer(obj) {
         },
     };
 }
-export function formatPrescribeAnswer(obj) {
+export function formatPrescribeAnswer(baseAnswer) {
+    const obj = Object.assign(Object.assign({}, baseAnswer), { drug: Object.assign({}, baseAnswer.drug), dose: Object.assign({}, baseAnswer.dose), units: Object.assign({}, baseAnswer.units), route: Object.assign({}, baseAnswer.route), frequency: Object.assign({}, baseAnswer.frequency), duration: Object.assign({}, baseAnswer.duration) });
     obj.drug.value = obj.drug.value.toLowerCase().replace(/\s/g, '');
     obj.route.value = obj.route.value
         .toLowerCase()

package/utils/uuid4.js

@@ -202,14 +202,9 @@ class Uuid4 {
      * @private
      */
     static _getRandomArray() {
-        if (typeof window === 'undefined') {
-            let crypto = require('crypto');
-            return Uint8Array.from(crypto.randomBytes(16));
-        }
-        // `result` is modified in place.
-        let result = new Uint8Array(16);
-        window.crypto.getRandomValues(result);
-        return result;
+        return Uint8Array.from(Array(16)
+            .fill(0)
+            .map(() => Math.round(Math.random() * 255)));
     }
 }
 /**

package/utils/uuid4.mjs

@@ -200,14 +200,9 @@ class Uuid4 {
      * @private
      */
     static _getRandomArray() {
-        if (typeof window === 'undefined') {
-            let crypto = require('crypto');
-            return Uint8Array.from(crypto.randomBytes(16));
-        }
-        // `result` is modified in place.
-        let result = new Uint8Array(16);
-        window.crypto.getRandomValues(result);
-        return result;
+        return Uint8Array.from(Array(16)
+            .fill(0)
+            .map(() => Math.round(Math.random() * 255)));
     }
 }
 /**