scorm-again 3.1.3 → 3.1.4

package/dist/esm/scorm-again.js

@@ -10646,6 +10646,26 @@ class RollupProcess {
   }
 }
 
+function evaluateCompletionStatusFromThreshold({
+  completionThreshold,
+  progressMeasure,
+  storedCompletionStatus
+}) {
+  if (completionThreshold !== "" && completionThreshold !== null && completionThreshold !== void 0) {
+    const thresholdValue = parseFloat(String(completionThreshold));
+    if (!isNaN(thresholdValue)) {
+      if (progressMeasure !== "" && progressMeasure !== null && progressMeasure !== void 0) {
+        const progressValue = parseFloat(String(progressMeasure));
+        if (!isNaN(progressValue)) {
+          return progressValue >= thresholdValue ? CompletionStatus.COMPLETED : CompletionStatus.INCOMPLETE;
+        }
+      }
+      return CompletionStatus.UNKNOWN;
+    }
+  }
+  return storedCompletionStatus || CompletionStatus.UNKNOWN;
+}
+
 const VALID_COMPLETION_STATUSES = [
   CompletionStatus.COMPLETED,
   CompletionStatus.INCOMPLETE,
@@ -10700,10 +10720,38 @@ class RteDataTransferService {
    * @param {CMIDataForTransfer} cmiData - CMI data from runtime
    */
   transferPrimaryObjective(activity, cmiData) {
-    const validatedCompletionStatus = validateCompletionStatus(cmiData.completion_status);
-    if (validatedCompletionStatus && validatedCompletionStatus !== CompletionStatus.UNKNOWN) {
-      activity.completionStatus = validatedCompletionStatus;
-      activity.attemptProgressStatus = true;
+    let hasProgressMeasure = false;
+    if (cmiData.progress_measure && cmiData.progress_measure !== "") {
+      const progressMeasure = parseFloat(cmiData.progress_measure);
+      if (!isNaN(progressMeasure)) {
+        hasProgressMeasure = true;
+        activity.progressMeasure = progressMeasure;
+        activity.progressMeasureStatus = true;
+        activity.attemptCompletionAmount = progressMeasure;
+        activity.attemptCompletionAmountStatus = true;
+        if (activity.primaryObjective) {
+          activity.primaryObjective.progressMeasure = progressMeasure;
+          activity.primaryObjective.progressMeasureStatus = true;
+        }
+      }
+    }
+    if (!hasProgressMeasure) {
+      activity.attemptCompletionAmountStatus = false;
+    }
+    if (activity.completedByMeasure) {
+      const completionStatus = evaluateCompletionStatusFromThreshold({
+        completionThreshold: activity.minProgressMeasure,
+        progressMeasure: cmiData.progress_measure,
+        storedCompletionStatus: CompletionStatus.UNKNOWN
+      });
+      activity.completionStatus = completionStatus;
+      activity.attemptProgressStatus = completionStatus !== CompletionStatus.UNKNOWN;
+    } else {
+      const validatedCompletionStatus = validateCompletionStatus(cmiData.completion_status);
+      if (validatedCompletionStatus && validatedCompletionStatus !== CompletionStatus.UNKNOWN) {
+        activity.completionStatus = validatedCompletionStatus;
+        activity.attemptProgressStatus = true;
+      }
     }
     let hasSuccessStatus = false;
     let successStatus = false;
@@ -10737,17 +10785,6 @@ class RteDataTransferService {
         activity.primaryObjective.progressStatus = true;
       }
     }
-    if (cmiData.progress_measure && cmiData.progress_measure !== "") {
-      const progressMeasure = parseFloat(cmiData.progress_measure);
-      if (!isNaN(progressMeasure)) {
-        activity.progressMeasure = progressMeasure;
-        activity.progressMeasureStatus = true;
-        if (activity.primaryObjective) {
-          activity.primaryObjective.progressMeasure = progressMeasure;
-          activity.primaryObjective.progressMeasureStatus = true;
-        }
-      }
-    }
   }
   /**
    * Transfer non-primary objective data from CMI to activity objectives
@@ -10952,6 +10989,18 @@ class TerminationHandler {
         this.endAttempt(this.activityTree.currentActivity);
       }
     }
+    const ancestorExitResult = this.applyAncestorExitActionRules(currentActivity);
+    if (ancestorExitResult.action === "EXIT_ALL") {
+      return this.handleExitAll(ancestorExitResult.activity || currentActivity);
+    }
+    if (ancestorExitResult.exception) {
+      return {
+        terminationRequest: SequencingRequestType.EXIT,
+        sequencingRequest: null,
+        exception: ancestorExitResult.exception,
+        valid: false
+      };
+    }
     let processedExit;
     let postConditionResult;
     do {
@@ -11179,16 +11228,14 @@ class TerminationHandler {
     for (const rule of exitRules) {
       let conditionsMet;
       if (rule.conditionCombination === "all") {
-        conditionsMet = rule.conditions.every(
-          (condition) => condition.evaluate(activity)
-        );
+        conditionsMet = rule.conditions.every((condition) => condition.evaluate(activity));
       } else {
-        conditionsMet = rule.conditions.some(
-          (condition) => condition.evaluate(activity)
-        );
+        conditionsMet = rule.conditions.some((condition) => condition.evaluate(activity));
       }
       if (conditionsMet) {
-        if (rule.action === RuleActionType.EXIT_PARENT) {
+        if (rule.action === RuleActionType.EXIT) {
+          return { action: "EXIT", recursionDepth };
+        } else if (rule.action === RuleActionType.EXIT_PARENT) {
           return { action: "EXIT_PARENT", recursionDepth };
         } else if (rule.action === RuleActionType.EXIT_ALL) {
           return { action: "EXIT_ALL", recursionDepth };
@@ -11222,6 +11269,55 @@ class TerminationHandler {
     this.processExitAtLevel(rootActivity, 0);
     this.terminateAll(rootActivity);
   }
+  /**
+   * Sequencing Exit Action Rules Subprocess (TB.2.1) ancestor walk
+   * @spec SN Book: TB.2.1 (Sequencing Exit Action Rules Subprocess)
+   * @param {Activity} terminatingActivity - The activity whose attempt just ended
+   * @return {{action: string | null, activity?: Activity, exception?: string}}
+   */
+  applyAncestorExitActionRules(terminatingActivity) {
+    const activityPath = [];
+    let current = terminatingActivity.parent;
+    while (current) {
+      activityPath.unshift(current);
+      current = current.parent;
+    }
+    for (const activity of activityPath) {
+      const exitAction = this.exitActionRulesSubprocess(activity);
+      if (exitAction === "EXIT_ALL") {
+        this.fireEvent("onAncestorExitAction", {
+          activity: activity.id,
+          action: exitAction
+        });
+        return { action: "EXIT_ALL", activity };
+      }
+      if (exitAction === "EXIT_PARENT") {
+        if (!activity.parent) {
+          return { action: "EXIT_PARENT", activity, exception: "TB.2.3-4" };
+        }
+        this.terminateDescendants(activity.parent);
+        this.activityTree.currentActivity = activity.parent;
+        this.endAttempt(activity.parent);
+        this.fireEvent("onAncestorExitAction", {
+          activity: activity.id,
+          action: exitAction,
+          currentActivity: activity.parent.id
+        });
+        return { action: "EXIT_PARENT", activity: activity.parent };
+      }
+      if (exitAction === "EXIT") {
+        this.terminateDescendants(activity);
+        this.activityTree.currentActivity = activity;
+        this.endAttempt(activity);
+        this.fireEvent("onAncestorExitAction", {
+          activity: activity.id,
+          action: exitAction
+        });
+        return { action: "EXIT", activity };
+      }
+    }
+    return { action: null };
+  }
   /**
    * Process exit actions at specific level
    * @param {Activity} activity - Activity to process
@@ -11304,16 +11400,14 @@ class TerminationHandler {
     for (const rule of exitRules) {
       let conditionsMet;
       if (rule.conditionCombination === "all") {
-        conditionsMet = rule.conditions.every(
-          (condition) => condition.evaluate(activity)
-        );
+        conditionsMet = rule.conditions.every((condition) => condition.evaluate(activity));
       } else {
-        conditionsMet = rule.conditions.some(
-          (condition) => condition.evaluate(activity)
-        );
+        conditionsMet = rule.conditions.some((condition) => condition.evaluate(activity));
       }
       if (conditionsMet) {
-        if (rule.action === RuleActionType.EXIT_PARENT) {
+        if (rule.action === RuleActionType.EXIT) {
+          return "EXIT";
+        } else if (rule.action === RuleActionType.EXIT_PARENT) {
           return "EXIT_PARENT";
         } else if (rule.action === RuleActionType.EXIT_ALL) {
           return "EXIT_ALL";
@@ -14867,7 +14961,29 @@ class SequencingService {
    * Update activity properties from current CMI values
    */
   updateActivityFromCMI(activity) {
-    if (this.cmi.completion_status !== "unknown") {
+    let hasProgressMeasure = false;
+    if (this.cmi.progress_measure !== "") {
+      const progressMeasure = parseFloat(this.cmi.progress_measure);
+      if (!isNaN(progressMeasure)) {
+        hasProgressMeasure = true;
+        activity.progressMeasure = progressMeasure;
+        activity.progressMeasureStatus = true;
+        activity.attemptCompletionAmount = progressMeasure;
+        activity.attemptCompletionAmountStatus = true;
+      }
+    }
+    if (!hasProgressMeasure) {
+      activity.attemptCompletionAmountStatus = false;
+    }
+    if (activity.completedByMeasure) {
+      const completionStatus = evaluateCompletionStatusFromThreshold({
+        completionThreshold: activity.minProgressMeasure,
+        progressMeasure: this.cmi.progress_measure,
+        storedCompletionStatus: CompletionStatus.UNKNOWN
+      });
+      activity.completionStatus = completionStatus;
+      activity.attemptProgressStatus = completionStatus !== CompletionStatus.UNKNOWN;
+    } else if (this.cmi.completion_status !== "unknown") {
       activity.completionStatus = this.cmi.completion_status;
       activity.attemptProgressStatus = true;
     }
@@ -14879,13 +14995,6 @@ class SequencingService {
         activity.primaryObjective.progressStatus = true;
       }
     }
-    if (this.cmi.progress_measure !== "") {
-      const progressMeasure = parseFloat(this.cmi.progress_measure);
-      if (!isNaN(progressMeasure)) {
-        activity.progressMeasure = progressMeasure;
-        activity.progressMeasureStatus = true;
-      }
-    }
     if (this.cmi.score && this.cmi.score.scaled !== "") {
       const scaledScore = parseFloat(this.cmi.score.scaled);
       if (!isNaN(scaledScore)) {
@@ -23014,22 +23123,11 @@ class Scorm2004CMIHandler {
    * @returns {string} The evaluated completion status
    */
   evaluateCompletionStatus() {
-    const threshold = this.context.cmi.completion_threshold;
-    const progressMeasure = this.context.cmi.progress_measure;
-    const storedStatus = this.context.cmi.completion_status;
-    if (threshold !== "" && threshold !== null && threshold !== void 0) {
-      const thresholdValue = parseFloat(String(threshold));
-      if (!isNaN(thresholdValue)) {
-        if (progressMeasure !== "" && progressMeasure !== null && progressMeasure !== void 0) {
-          const progressValue = parseFloat(String(progressMeasure));
-          if (!isNaN(progressValue)) {
-            return progressValue >= thresholdValue ? CompletionStatus.COMPLETED : CompletionStatus.INCOMPLETE;
-          }
-        }
-        return CompletionStatus.UNKNOWN;
-      }
-    }
-    return storedStatus || CompletionStatus.UNKNOWN;
+    return evaluateCompletionStatusFromThreshold({
+      completionThreshold: this.context.cmi.completion_threshold,
+      progressMeasure: this.context.cmi.progress_measure,
+      storedCompletionStatus: this.context.cmi.completion_status
+    });
   }
   /**
    * Evaluates success_status per SCORM 2004 RTE Table 4.2.21.1a
@@ -23689,6 +23787,21 @@ class ActivityTreeBuilder {
     if (activitySettings.rollupConsiderations) {
       activity.applyRollupConsiderations(activitySettings.rollupConsiderations);
     }
+    if (activitySettings.completionThreshold) {
+      const threshold = activitySettings.completionThreshold;
+      if (threshold.completedByMeasure !== void 0) {
+        activity.completedByMeasure = threshold.completedByMeasure;
+      }
+      if (threshold.minProgressMeasure !== void 0) {
+        activity.minProgressMeasure = threshold.minProgressMeasure;
+        activity.completionThreshold = threshold.minProgressMeasure.toString();
+      } else if (threshold.completedByMeasure) {
+        activity.completionThreshold = activity.minProgressMeasure.toString();
+      }
+      if (threshold.progressWeight !== void 0) {
+        activity.progressWeight = threshold.progressWeight;
+      }
+    }
     if (activitySettings.hideLmsUi) {
       const mergedHide = this.sequencingConfigBuilder.mergeHideLmsUi(
         activity.hideLmsUi,
@@ -24732,8 +24845,23 @@ class Scorm2004API extends BaseAPI {
   reset(settings) {
     this.commonReset(settings);
     this.cmi?.reset();
+    this.applyCurrentActivityLaunchData();
     this.adl?.reset();
   }
+  /**
+   * Apply launch-static activity data to CMI while the new SCO is pre-initialize.
+   *
+   * @spec SCORM 2004 4th Ed. RTE 4.2.9 - cmi.completion_threshold
+   */
+  applyCurrentActivityLaunchData() {
+    const currentActivity = this._sequencing?.getCurrentActivity();
+    if (!this.cmi || !currentActivity) {
+      return;
+    }
+    const contentActivityData = this._sequencing.overallSequencingProcess?.getContentActivityData(currentActivity);
+    const completionThreshold = contentActivityData?.completionThreshold ?? currentActivity.completionThreshold?.toString() ?? "";
+    this.cmi.completion_threshold = completionThreshold;
+  }
   /**
    * Getter for _version
    * @return {string}
@@ -25244,14 +25372,14 @@ class Scorm2004API extends BaseAPI {
       if (this.cmi.mode === "normal") {
         if (this.cmi.credit === "credit") {
           if (this.cmi.completion_threshold && this.cmi.progress_measure) {
-            if (this.cmi.progress_measure >= this.cmi.completion_threshold) {
+            if (parseFloat(this.cmi.progress_measure) >= parseFloat(this.cmi.completion_threshold)) {
               this.cmi.completion_status = "completed";
             } else {
               this.cmi.completion_status = "incomplete";
             }
           }
           if (this.cmi.scaled_passing_score && this.cmi.score.scaled) {
-            if (this.cmi.score.scaled >= this.cmi.scaled_passing_score) {
+            if (parseFloat(this.cmi.score.scaled) >= parseFloat(this.cmi.scaled_passing_score)) {
               this.cmi.success_status = "passed";
             } else {
               this.cmi.success_status = "failed";