@openstax/ts-utils 1.6.2 → 1.7.0

package/dist/cjs/misc/helpers.js

@@ -117,7 +117,18 @@ exports.mapFind = mapFind;
 const once = (fn) => {
     const initialValue = {};
     let result = initialValue;
-    return ((...args) => result === initialValue ? (result = fn(...args)) : result);
+    return ((...args) => {
+        if (result !== initialValue) {
+            return result;
+        }
+        result = fn(...args);
+        if (typeof result === 'object' && result instanceof Promise) {
+            // Clear the result when possible but do not return a Promise that resolves to the initialValue
+            result.catch(() => result = initialValue);
+        }
+        // If this is a rejected Promise, it should be returned before catch() actually overwrites it
+        return result;
+    });
 };
 exports.once = once;
 /**

package/dist/cjs/services/lrsGateway/xapiUtils.d.ts

@@ -9,7 +9,7 @@ export interface Grade {
     comment?: string;
     activityProgress: 'Initialized' | 'Started' | 'inProgress' | 'Submitted' | 'Completed';
     gradingProgress: 'FullyGraded' | 'Pending' | 'PendingManual' | 'Failed' | 'NotReady';
-    userId: string;
+    userId?: string;
 }
 export declare const getRegistrationAttemptInfo: (lrs: LrsGateway, registration: string, options?: {
     activity?: string | undefined;
@@ -25,7 +25,7 @@ export declare const getScoreGrade: (score: {
     raw?: number;
     min?: number;
     max?: number;
-}, completed: boolean, userId: string, maxScore?: number | undefined) => Grade;
+}, completed: boolean, userId?: string | undefined, maxScore?: number | undefined) => Grade;
 export declare type Progress = {
     scaled: number;
     max?: number;
@@ -34,6 +34,7 @@ export declare type Progress = {
 export declare type GradeAndProgress = {
     grade: Grade;
     progress: Progress;
+    name?: string;
 };
 export declare const getCurrentGrade: (services: {
     lrs: LrsGateway;
@@ -41,6 +42,7 @@ export declare const getCurrentGrade: (services: {
 }, registration: string, options?: {
     currentPreference?: "latest" | "oldest" | undefined;
     incompleteAttemptCallback?: ((info: ActivityState) => Promise<GradeAndProgress>) | undefined;
+    name?: string | undefined;
     scoreMaximum?: number | undefined;
     userId?: string | undefined;
 } | undefined) => Promise<GradeAndProgress | null>;

package/dist/cjs/services/lrsGateway/xapiUtils.js

@@ -48,17 +48,20 @@ const getScoreGrade = (score, completed, userId, maxScore) => {
     };
 };
 exports.getScoreGrade = getScoreGrade;
-// These methods assigns 0's to incomplete activities
-const getCompletedActivityStateGradeAndProgress = (state, userId, maxScore) => {
+// These methods assign 0's to incomplete activities
+const getCompletedActivityStateGradeAndProgress = ({ name, scoreMaximum, state, userId }) => {
     var _a, _b;
     return ({
-        grade: (0, exports.getScoreGrade)(((_b = (_a = state.currentAttemptCompleted) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.score) || {}, !!state.currentAttemptCompleted, userId, maxScore),
+        grade: (0, exports.getScoreGrade)(((_b = (_a = state.currentAttemptCompleted) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.score) || {}, !!state.currentAttemptCompleted, userId, scoreMaximum),
         progress: {
             scaled: state.currentAttemptCompleted ? 1 : 0,
         },
+        name,
     });
 };
-const getCompletedUserInfosGradeAndProgress = (infos, scoreMaximum) => infos.map(({ data, fullName, platformUserId }) => getCompletedActivityStateGradeAndProgress(data, platformUserId !== null && platformUserId !== void 0 ? platformUserId : fullName, scoreMaximum));
+const getCompletedUserInfosGradeAndProgress = (infos, scoreMaximum) => infos.map(({ data, fullName, platformUserId }) => getCompletedActivityStateGradeAndProgress({
+    name: fullName, scoreMaximum, userId: platformUserId, state: data
+}));
 const getCurrentGrade = async (services, registration, options) => {
     var _a;
     const user = await services.ltiAuthProvider.getUser();
@@ -66,14 +69,14 @@ const getCurrentGrade = async (services, registration, options) => {
         return null;
     }
     const userId = (_a = options === null || options === void 0 ? void 0 : options.userId) !== null && _a !== void 0 ? _a : user.uuid;
-    const { currentPreference, incompleteAttemptCallback, scoreMaximum } = options !== null && options !== void 0 ? options : {};
+    const { currentPreference, incompleteAttemptCallback, name, scoreMaximum } = options !== null && options !== void 0 ? options : {};
     const infoPerUser = await (0, exports.getRegistrationAttemptInfo)(services.lrs, registration, { currentPreference });
     const userInfo = infoPerUser[user.uuid];
     if (!userInfo) {
-        return getCompletedActivityStateGradeAndProgress((0, attempt_utils_1.resolveAttemptInfo)([]), userId, scoreMaximum);
+        return getCompletedActivityStateGradeAndProgress({ name, scoreMaximum, state: (0, attempt_utils_1.resolveAttemptInfo)([]), userId });
     }
     if (userInfo.currentAttemptCompleted || !incompleteAttemptCallback) {
-        return getCompletedActivityStateGradeAndProgress(userInfo, userId, scoreMaximum);
+        return getCompletedActivityStateGradeAndProgress({ name, scoreMaximum, state: userInfo, userId });
     }
     return incompleteAttemptCallback(userInfo);
 };