scorm-again 2.5.0 → 2.6.0

package/src/Scorm2004API.ts

@@ -2,12 +2,13 @@ import BaseAPI from "./BaseAPI";
 import { CMI } from "./cmi/scorm2004/cmi";
 import * as Utilities from "./utilities";
 import { stringMatches } from "./utilities";
-import APIConstants from "./constants/api_constants";
-import ErrorCodes from "./constants/error_codes";
+import {
+  global_constants,
+  scorm2004_constants,
+} from "./constants/api_constants";
+import { scorm2004_errors } from "./constants/error_codes";
 import { CorrectResponses, ResponseType } from "./constants/response_constants";
 import ValidLanguages from "./constants/language_constants";
-import Regex from "./constants/regex";
-import regex from "./constants/regex";
 import { CMIArray } from "./cmi/common/array";
 import { BaseCMI } from "./cmi/common/base_cmi";
 import {
@@ -17,7 +18,7 @@ import {
 } from "./cmi/scorm2004/interactions";
 import { CMICommentsObject } from "./cmi/scorm2004/comments";
 import { CMIObjectivesObject } from "./cmi/scorm2004/objectives";
-import { ADL } from "./cmi/scorm2004/adl";
+import { ADL, ADLDataObject } from "./cmi/scorm2004/adl";
 import {
   CommitObject,
   RefObject,
@@ -26,12 +27,14 @@ import {
   Settings,
 } from "./types/api_types";
 import { CompletionStatus, SuccessStatus } from "./constants/enums";
+import { scorm2004_regex } from "./constants/regex";
 
 /**
  * API class for SCORM 2004
  */
 class Scorm2004Impl extends BaseAPI {
   private _version: string = "1.0";
+  private _globalObjectives: CMIObjectivesObject[] = [];
 
   /**
    * Constructor for SCORM 2004 API
@@ -44,7 +47,7 @@ class Scorm2004Impl extends BaseAPI {
       }
     }
 
-    super(ErrorCodes.scorm2004, settings);
+    super(scorm2004_errors, settings);
 
     this.cmi = new CMI();
     this.adl = new ADL();
@@ -78,8 +81,8 @@ class Scorm2004Impl extends BaseAPI {
   reset(settings?: Settings) {
     this.commonReset(settings);
 
-    this.cmi = new CMI();
-    this.adl = new ADL();
+    this.cmi?.reset();
+    this.adl?.reset();
   }
 
   /**
@@ -90,6 +93,13 @@ class Scorm2004Impl extends BaseAPI {
     return this._version;
   }
 
+  /**
+   * Getter for _globalObjectives
+   */
+  get globalObjectives(): CMIObjectivesObject[] {
+    return this._globalObjectives;
+  }
+
   /**
    * @return {string} bool
    */
@@ -105,13 +115,13 @@ class Scorm2004Impl extends BaseAPI {
     (async () => {
       await this.internalFinish();
     })();
-    return APIConstants.global.SCORM_TRUE;
+    return global_constants.SCORM_TRUE;
   }
 
   async internalFinish(): Promise<string> {
     const result = await this.terminate("Terminate", true);
 
-    if (result === APIConstants.global.SCORM_TRUE) {
+    if (result === global_constants.SCORM_TRUE) {
       if (this.adl.nav.request !== "_none_") {
         const navActions: { [key: string]: string } = {
           continue: "SequenceNext",
@@ -125,7 +135,7 @@ class Scorm2004Impl extends BaseAPI {
         };
 
         let request = this.adl.nav.request;
-        const choiceJumpRegex = new RegExp(regex.scorm2004.NAVEvent);
+        const choiceJumpRegex = new RegExp(scorm2004_regex.NAVEvent);
         const matches = request.match(choiceJumpRegex);
         let target = "";
         if (matches) {
@@ -176,6 +186,7 @@ class Scorm2004Impl extends BaseAPI {
    * @return {string}
    */
   lmsSetValue(CMIElement: string, value: any): string {
+    // Proceed with regular setting for non-objective elements or fallback behavior
     return this.setValue("SetValue", "Commit", true, CMIElement, value);
   }
 
@@ -192,7 +203,7 @@ class Scorm2004Impl extends BaseAPI {
         await this.commit("LMSCommit", false);
       })();
     }
-    return APIConstants.global.SCORM_TRUE;
+    return global_constants.SCORM_TRUE;
   }
 
   /**
@@ -232,6 +243,57 @@ class Scorm2004Impl extends BaseAPI {
    * @return {string}
    */
   override setCMIValue(CMIElement: string, value: any): string {
+    // Check if we're updating a global or local objective
+    if (stringMatches(CMIElement, "cmi\\.objectives\\.\\d+")) {
+      const parts = CMIElement.split(".");
+      const index = Number(parts[2]);
+      const element_base = `cmi.objectives.${index}`;
+
+      let objective_id;
+      const setting_id = stringMatches(
+        CMIElement,
+        "cmi\\.objectives\\.\\d+\\.id",
+      );
+
+      if (setting_id) {
+        // If we're setting the objective ID, capture it directly
+        objective_id = value;
+      } else {
+        // Find existing objective ID if available
+        const objective = this.cmi.objectives.findObjectiveByIndex(index);
+        objective_id = objective ? objective.id : undefined;
+      }
+
+      // Check if the objective ID matches a global objective
+      const is_global =
+        objective_id && this.settings.globalObjectiveIds.includes(objective_id);
+
+      if (is_global) {
+        // Locate or create an entry in _globalObjectives for the global objective
+        let global_index = this._globalObjectives.findIndex(
+          (obj) => obj.id === objective_id,
+        );
+
+        if (global_index === -1) {
+          global_index = this._globalObjectives.length;
+          const newGlobalObjective = new CMIObjectivesObject();
+          newGlobalObjective.id = objective_id;
+          this._globalObjectives.push(newGlobalObjective);
+        }
+
+        // Update the global objective
+        const global_element = CMIElement.replace(
+          element_base,
+          `_globalObjectives.${global_index}`,
+        );
+        this._commonSetCMIValue(
+          "SetGlobalObjectiveValue",
+          true,
+          global_element,
+          value,
+        );
+      }
+    }
     return this._commonSetCMIValue("SetValue", true, CMIElement, value);
   }
 
@@ -278,6 +340,10 @@ class Scorm2004Impl extends BaseAPI {
       return new CMICommentsObject(true);
     }
 
+    if (stringMatches(CMIElement, "adl\\.data\\.\\d+")) {
+      return new ADLDataObject();
+    }
+
     return null;
   }
 
@@ -291,7 +357,7 @@ class Scorm2004Impl extends BaseAPI {
 
     if (this.isInitialized()) {
       if (!interaction.type) {
-        this.throwSCORMError(ErrorCodes.scorm2004.DEPENDENCY_NOT_ESTABLISHED);
+        this.throwSCORMError(scorm2004_errors.DEPENDENCY_NOT_ESTABLISHED);
       } else {
         this.checkDuplicateChoiceResponse(interaction, value);
         const response_type = CorrectResponses[interaction.type];
@@ -299,7 +365,7 @@ class Scorm2004Impl extends BaseAPI {
           this.checkValidResponseType(response_type, value, interaction.type);
         } else {
           this.throwSCORMError(
-            ErrorCodes.scorm2004.GENERAL_SET_FAILURE,
+            scorm2004_errors.GENERAL_SET_FAILURE,
             "Incorrect Response Type: " + interaction.type,
           );
         }
@@ -335,7 +401,7 @@ class Scorm2004Impl extends BaseAPI {
       this.checkCorrectResponseValue(interaction_type, nodes, value);
     } else if (nodes.length > response_type.max) {
       this.throwSCORMError(
-        ErrorCodes.scorm2004.GENERAL_SET_FAILURE,
+        scorm2004_errors.GENERAL_SET_FAILURE,
         "Data Model Element Pattern Too Long",
       );
     }
@@ -356,7 +422,7 @@ class Scorm2004Impl extends BaseAPI {
       ) {
         const response = interaction.correct_responses.childArray[i];
         if (response.pattern === value) {
-          this.throwSCORMError(ErrorCodes.scorm2004.GENERAL_SET_FAILURE);
+          this.throwSCORMError(scorm2004_errors.GENERAL_SET_FAILURE);
         }
       }
     }
@@ -397,14 +463,14 @@ class Scorm2004Impl extends BaseAPI {
       } else {
         if (this.lastErrorCode === "0") {
           this.throwSCORMError(
-            ErrorCodes.scorm2004.GENERAL_SET_FAILURE,
+            scorm2004_errors.GENERAL_SET_FAILURE,
             "Data Model Element Pattern Already Exists",
           );
         }
       }
     } else {
       this.throwSCORMError(
-        ErrorCodes.scorm2004.GENERAL_SET_FAILURE,
+        scorm2004_errors.GENERAL_SET_FAILURE,
         "Data Model Element Collection Limit Reached",
       );
     }
@@ -436,11 +502,11 @@ class Scorm2004Impl extends BaseAPI {
 
     // Set error number to string since inconsistent from modules if string or number
     errorNumber = String(errorNumber);
-    if (APIConstants.scorm2004.error_descriptions[errorNumber]) {
+    if (scorm2004_constants.error_descriptions[errorNumber]) {
       basicMessage =
-        APIConstants.scorm2004.error_descriptions[errorNumber].basicMessage;
+        scorm2004_constants.error_descriptions[errorNumber].basicMessage;
       detailMessage =
-        APIConstants.scorm2004.error_descriptions[errorNumber].detailMessage;
+        scorm2004_constants.error_descriptions[errorNumber].detailMessage;
     }
 
     return detail ? detailMessage : basicMessage;
@@ -495,17 +561,17 @@ class Scorm2004Impl extends BaseAPI {
         if (values.length === 2) {
           const matches = values[0].match(formatRegex);
           if (!matches) {
-            this.throwSCORMError(ErrorCodes.scorm2004.TYPE_MISMATCH);
+            this.throwSCORMError(scorm2004_errors.TYPE_MISMATCH);
           } else {
             if (
               !response.format2 ||
               !values[1].match(new RegExp(response.format2))
             ) {
-              this.throwSCORMError(ErrorCodes.scorm2004.TYPE_MISMATCH);
+              this.throwSCORMError(scorm2004_errors.TYPE_MISMATCH);
             }
           }
         } else {
-          this.throwSCORMError(ErrorCodes.scorm2004.TYPE_MISMATCH);
+          this.throwSCORMError(scorm2004_errors.TYPE_MISMATCH);
         }
       } else {
         const matches = nodes[i].match(formatRegex);
@@ -513,17 +579,17 @@ class Scorm2004Impl extends BaseAPI {
           (!matches && value !== "") ||
           (!matches && interaction_type === "true-false")
         ) {
-          this.throwSCORMError(ErrorCodes.scorm2004.TYPE_MISMATCH);
+          this.throwSCORMError(scorm2004_errors.TYPE_MISMATCH);
         } else {
           if (interaction_type === "numeric" && nodes.length > 1) {
             if (Number(nodes[0]) > Number(nodes[1])) {
-              this.throwSCORMError(ErrorCodes.scorm2004.TYPE_MISMATCH);
+              this.throwSCORMError(scorm2004_errors.TYPE_MISMATCH);
             }
           } else {
             if (nodes[i] !== "" && response.unique) {
               for (let j = 0; j < i && this.lastErrorCode === "0"; j++) {
                 if (nodes[i] === nodes[j]) {
-                  this.throwSCORMError(ErrorCodes.scorm2004.TYPE_MISMATCH);
+                  this.throwSCORMError(scorm2004_errors.TYPE_MISMATCH);
                 }
               }
             }
@@ -551,12 +617,12 @@ class Scorm2004Impl extends BaseAPI {
     while (matches) {
       switch (matches[2]) {
         case "lang":
-          langMatches = node.match(Regex.scorm2004.CMILangcr);
+          langMatches = node.match(scorm2004_regex.CMILangcr);
           if (langMatches) {
             const lang = langMatches[3];
             if (lang !== undefined && lang.length > 0) {
               if (!ValidLanguages.includes(lang.toLowerCase())) {
-                this.throwSCORMError(ErrorCodes.scorm2004.TYPE_MISMATCH);
+                this.throwSCORMError(scorm2004_errors.TYPE_MISMATCH);
               }
             }
           }
@@ -565,7 +631,7 @@ class Scorm2004Impl extends BaseAPI {
         case "case_matters":
           if (!seenLang && !seenOrder && !seenCase) {
             if (matches[3] !== "true" && matches[3] !== "false") {
-              this.throwSCORMError(ErrorCodes.scorm2004.TYPE_MISMATCH);
+              this.throwSCORMError(scorm2004_errors.TYPE_MISMATCH);
             }
           }
 
@@ -574,7 +640,7 @@ class Scorm2004Impl extends BaseAPI {
         case "order_matters":
           if (!seenCase && !seenLang && !seenOrder) {
             if (matches[3] !== "true" && matches[3] !== "false") {
-              this.throwSCORMError(ErrorCodes.scorm2004.TYPE_MISMATCH);
+              this.throwSCORMError(scorm2004_errors.TYPE_MISMATCH);
             }
           }
 
@@ -639,7 +705,7 @@ class Scorm2004Impl extends BaseAPI {
     const totalTimeDuration = this.cmi.getCurrentTotalTime();
     const totalTimeSeconds = Utilities.getDurationAsSeconds(
       totalTimeDuration,
-      Regex.scorm2004.CMITimespan,
+      scorm2004_regex.CMITimespan,
     );
 
     let completionStatus = CompletionStatus.unknown;
@@ -747,7 +813,7 @@ class Scorm2004Impl extends BaseAPI {
       return result;
     } else {
       return {
-        result: APIConstants.global.SCORM_TRUE,
+        result: global_constants.SCORM_TRUE,
         errorCode: 0,
       };
     }

package/src/cmi/aicc/attempts.ts

@@ -1,9 +1,9 @@
 import { BaseCMI } from "../common/base_cmi";
 import { CMIScore } from "../common/score";
-import APIConstants from "../../constants/api_constants";
-import Regex from "../../constants/regex";
-import ErrorCodes from "../../constants/error_codes";
-import { AICCValidationError } from "../../exceptions";
+import { aicc_constants } from "../../constants/api_constants";
+import { aicc_regex } from "../../constants/regex";
+import { scorm12_errors } from "../../constants/error_codes";
+import { AICCValidationError } from "../../exceptions/aicc_exceptions";
 import { checkAICCValidFormat } from "./validation";
 import { CMIArray } from "../common/array";
 
@@ -16,7 +16,7 @@ export class CMIAttemptRecords extends CMIArray {
    */
   constructor() {
     super({
-      children: APIConstants.aicc.attempt_records_children,
+      children: aicc_constants.attempt_records_children,
     });
   }
 }
@@ -25,17 +25,19 @@ export class CMIAttemptRecords extends CMIArray {
  * Class for AICC Attempt Records
  */
 export class CMIAttemptRecordsObject extends BaseCMI {
+  private _lesson_status = "";
+
   /**
    * Constructor for AICC Attempt Records object
    */
   constructor() {
     super();
     this.score = new CMIScore({
-      score_children: APIConstants.aicc.score_children,
-      score_range: Regex.aicc.score_range,
-      invalidErrorCode: ErrorCodes.scorm12.INVALID_SET_VALUE,
-      invalidTypeCode: ErrorCodes.scorm12.TYPE_MISMATCH,
-      invalidRangeCode: ErrorCodes.scorm12.VALUE_OUT_OF_RANGE,
+      score_children: aicc_constants.score_children,
+      score_range: aicc_regex.score_range,
+      invalidErrorCode: scorm12_errors.INVALID_SET_VALUE,
+      invalidTypeCode: scorm12_errors.TYPE_MISMATCH,
+      invalidRangeCode: scorm12_errors.VALUE_OUT_OF_RANGE,
       errorClass: AICCValidationError,
     });
   }
@@ -47,10 +49,18 @@ export class CMIAttemptRecordsObject extends BaseCMI {
    */
   override initialize() {
     super.initialize();
+
+    this._lesson_status = "";
     this.score?.initialize();
   }
 
-  private _lesson_status = "";
+  /**
+   * Called when the API has been reset
+   */
+  reset(): void {
+    this._initialized = false;
+    this.score?.reset();
+  }
 
   /**
    * Getter for _lesson_status
@@ -65,7 +75,7 @@ export class CMIAttemptRecordsObject extends BaseCMI {
    * @param {string} lesson_status
    */
   set lesson_status(lesson_status: string) {
-    if (checkAICCValidFormat(lesson_status, Regex.aicc.CMIStatus2)) {
+    if (checkAICCValidFormat(lesson_status, aicc_regex.CMIStatus2)) {
       this._lesson_status = lesson_status;
     }
   }

package/src/cmi/aicc/cmi.ts

@@ -1,5 +1,5 @@
 import * as Scorm12CMI from "../scorm12/cmi";
-import APIConstants from "../../constants/api_constants";
+import { aicc_constants } from "../../constants/api_constants";
 import { CMIEvaluation } from "./evaluation";
 import { AICCStudentPreferences } from "./student_preferences";
 import { CMIStudentDemographics } from "./student_demographics";
@@ -20,7 +20,7 @@ export class CMI extends Scorm12CMI.CMI {
    * @param {boolean} initialized
    */
   constructor(initialized: boolean = false) {
-    super(APIConstants.aicc.cmi_children);
+    super(aicc_constants.cmi_children);
     if (initialized) this.initialize();
     this.student_preference = new AICCStudentPreferences();
     this.student_data = new AICCCMIStudentData();

package/src/cmi/aicc/core.ts

@@ -1,9 +1,9 @@
 import { BaseCMI } from "../common/base_cmi";
 import { CMIScore } from "../common/score";
-import APIConstants from "../../constants/api_constants";
-import Regex from "../../constants/regex";
-import ErrorCodes from "../../constants/error_codes";
-import { Scorm12ValidationError } from "../../exceptions";
+import { scorm12_constants } from "../../constants/api_constants";
+import { scorm12_regex } from "../../constants/regex";
+import { scorm12_errors } from "../../constants/error_codes";
+import { Scorm12ValidationError } from "../../exceptions/scorm12_exceptions";
 import { check12ValidFormat } from "../scorm12/validation";
 import * as Util from "../../utilities";
 
@@ -18,11 +18,11 @@ export class CMICore extends BaseCMI {
   constructor() {
     super();
     this.score = new CMIScore({
-      score_children: APIConstants.scorm12.score_children,
-      score_range: Regex.scorm12.score_range,
-      invalidErrorCode: ErrorCodes.scorm12.INVALID_SET_VALUE,
-      invalidTypeCode: ErrorCodes.scorm12.TYPE_MISMATCH,
-      invalidRangeCode: ErrorCodes.scorm12.VALUE_OUT_OF_RANGE,
+      score_children: scorm12_constants.score_children,
+      score_range: scorm12_regex.score_range,
+      invalidErrorCode: scorm12_errors.INVALID_SET_VALUE,
+      invalidTypeCode: scorm12_errors.TYPE_MISMATCH,
+      invalidRangeCode: scorm12_errors.VALUE_OUT_OF_RANGE,
       errorClass: Scorm12ValidationError,
     });
   }
@@ -37,7 +37,7 @@ export class CMICore extends BaseCMI {
     this.score?.initialize();
   }
 
-  private __children = APIConstants.scorm12.core_children;
+  private __children = scorm12_constants.core_children;
   private _student_id = "";
   private _student_name = "";
   private _lesson_location = "";
@@ -50,6 +50,24 @@ export class CMICore extends BaseCMI {
   private _session_time = "00:00:00";
   private _suspend_data = "";
 
+  /**
+   * Called when the API has been reset
+   */
+  reset(): void {
+    this._initialized = false;
+
+    this._exit = "";
+    this._entry = "";
+
+    /**
+     * Resetting ensures we accurately track the time spent on each individual SCO session independently. Each new
+     * session should start from zero, so we can reset cmi.core.session_time at the beginning of each session.
+     */
+    this._session_time = "00:00:00";
+
+    this.score?.reset();
+  }
+
   /**
    * Getter for __children
    * @return {string}
@@ -65,7 +83,7 @@ export class CMICore extends BaseCMI {
    * @private
    */
   set _children(_children: string) {
-    throw new Scorm12ValidationError(ErrorCodes.scorm12.INVALID_SET_VALUE);
+    throw new Scorm12ValidationError(scorm12_errors.INVALID_SET_VALUE);
   }
 
   /**
@@ -82,7 +100,7 @@ export class CMICore extends BaseCMI {
    */
   set student_id(student_id: string) {
     if (this.initialized) {
-      throw new Scorm12ValidationError(ErrorCodes.scorm12.READ_ONLY_ELEMENT);
+      throw new Scorm12ValidationError(scorm12_errors.READ_ONLY_ELEMENT);
     } else {
       this._student_id = student_id;
     }
@@ -102,7 +120,7 @@ export class CMICore extends BaseCMI {
    */
   set student_name(student_name: string) {
     if (this.initialized) {
-      throw new Scorm12ValidationError(ErrorCodes.scorm12.READ_ONLY_ELEMENT);
+      throw new Scorm12ValidationError(scorm12_errors.READ_ONLY_ELEMENT);
     } else {
       this._student_name = student_name;
     }
@@ -121,7 +139,7 @@ export class CMICore extends BaseCMI {
    * @param {string} lesson_location
    */
   set lesson_location(lesson_location: string) {
-    if (check12ValidFormat(lesson_location, Regex.scorm12.CMIString256, true)) {
+    if (check12ValidFormat(lesson_location, scorm12_regex.CMIString256, true)) {
       this._lesson_location = lesson_location;
     }
   }
@@ -140,7 +158,7 @@ export class CMICore extends BaseCMI {
    */
   set credit(credit: string) {
     if (this.initialized) {
-      throw new Scorm12ValidationError(ErrorCodes.scorm12.READ_ONLY_ELEMENT);
+      throw new Scorm12ValidationError(scorm12_errors.READ_ONLY_ELEMENT);
     } else {
       this._credit = credit;
     }
@@ -160,11 +178,11 @@ export class CMICore extends BaseCMI {
    */
   set lesson_status(lesson_status: string) {
     if (this.initialized) {
-      if (check12ValidFormat(lesson_status, Regex.scorm12.CMIStatus)) {
+      if (check12ValidFormat(lesson_status, scorm12_regex.CMIStatus)) {
         this._lesson_status = lesson_status;
       }
     } else {
-      if (check12ValidFormat(lesson_status, Regex.scorm12.CMIStatus2)) {
+      if (check12ValidFormat(lesson_status, scorm12_regex.CMIStatus2)) {
         this._lesson_status = lesson_status;
       }
     }
@@ -184,7 +202,7 @@ export class CMICore extends BaseCMI {
    */
   set entry(entry: string) {
     if (this.initialized) {
-      throw new Scorm12ValidationError(ErrorCodes.scorm12.READ_ONLY_ELEMENT);
+      throw new Scorm12ValidationError(scorm12_errors.READ_ONLY_ELEMENT);
     } else {
       this._entry = entry;
     }
@@ -204,7 +222,7 @@ export class CMICore extends BaseCMI {
    */
   set total_time(total_time: string) {
     if (this.initialized) {
-      throw new Scorm12ValidationError(ErrorCodes.scorm12.READ_ONLY_ELEMENT);
+      throw new Scorm12ValidationError(scorm12_errors.READ_ONLY_ELEMENT);
     } else {
       this._total_time = total_time;
     }
@@ -224,7 +242,7 @@ export class CMICore extends BaseCMI {
    */
   set lesson_mode(lesson_mode: string) {
     if (this.initialized) {
-      throw new Scorm12ValidationError(ErrorCodes.scorm12.READ_ONLY_ELEMENT);
+      throw new Scorm12ValidationError(scorm12_errors.READ_ONLY_ELEMENT);
     } else {
       this._lesson_mode = lesson_mode;
     }
@@ -236,7 +254,7 @@ export class CMICore extends BaseCMI {
    */
   get exit(): string {
     if (!this.jsonString) {
-      throw new Scorm12ValidationError(ErrorCodes.scorm12.WRITE_ONLY_ELEMENT);
+      throw new Scorm12ValidationError(scorm12_errors.WRITE_ONLY_ELEMENT);
     }
     return this._exit;
   }
@@ -246,7 +264,7 @@ export class CMICore extends BaseCMI {
    * @param {string} exit
    */
   set exit(exit: string) {
-    if (check12ValidFormat(exit, Regex.scorm12.CMIExit, true)) {
+    if (check12ValidFormat(exit, scorm12_regex.CMIExit, true)) {
       this._exit = exit;
     }
   }
@@ -257,7 +275,7 @@ export class CMICore extends BaseCMI {
    */
   get session_time(): string {
     if (!this.jsonString) {
-      throw new Scorm12ValidationError(ErrorCodes.scorm12.WRITE_ONLY_ELEMENT);
+      throw new Scorm12ValidationError(scorm12_errors.WRITE_ONLY_ELEMENT);
     }
     return this._session_time;
   }
@@ -267,7 +285,7 @@ export class CMICore extends BaseCMI {
    * @param {string} session_time
    */
   set session_time(session_time: string) {
-    if (check12ValidFormat(session_time, Regex.scorm12.CMITimespan)) {
+    if (check12ValidFormat(session_time, scorm12_regex.CMITimespan)) {
       this._session_time = session_time;
     }
   }
@@ -285,7 +303,7 @@ export class CMICore extends BaseCMI {
    * @param {string} suspend_data
    */
   set suspend_data(suspend_data: string) {
-    if (check12ValidFormat(suspend_data, Regex.scorm12.CMIString4096, true)) {
+    if (check12ValidFormat(suspend_data, scorm12_regex.CMIString4096, true)) {
       this._suspend_data = suspend_data;
     }
   }
@@ -307,7 +325,7 @@ export class CMICore extends BaseCMI {
     return Util.addHHMMSSTimeStrings(
       this._total_time,
       sessionTime,
-      new RegExp(Regex.scorm12.CMITimespan),
+      new RegExp(scorm12_regex.CMITimespan),
     );
   }