scorm-again 2.4.1 → 2.5.0

package/dist/scorm-again.js

@@ -954,9 +954,12 @@ var error_codes = __webpack_require__(797);
 var api_constants = __webpack_require__(340);
 // EXTERNAL MODULE: ./src/utilities.ts
 var utilities = __webpack_require__(864);
+// EXTERNAL MODULE: ./src/constants/enums.ts
+var enums = __webpack_require__(56);
 ;// ./src/constants/default_settings.ts
 
 
+
 var DefaultSettings = {
     autocommit: false,
     autocommitSeconds: 10,
@@ -966,7 +969,7 @@ var DefaultSettings = {
     dataCommitFormat: "json",
     commitRequestDataType: "application/json;charset=UTF-8",
     autoProgress: false,
-    logLevel: api_constants/* default */.A.global.LOG_LEVEL_ERROR,
+    logLevel: enums/* LogLevelEnum */.Mb.ERROR,
     selfReportSessionTime: false,
     alwaysSendTotalTime: false,
     renderCommonCommitFields: false,
@@ -1027,16 +1030,28 @@ var DefaultSettings = {
     },
     onLogMessage: function (messageLevel, logMessage) {
         switch (messageLevel) {
-            case api_constants/* default */.A.global.LOG_LEVEL_ERROR:
+            case "4":
+            case 4:
+            case "ERROR":
+            case enums/* LogLevelEnum */.Mb.ERROR:
                 console.error(logMessage);
                 break;
-            case api_constants/* default */.A.global.LOG_LEVEL_WARNING:
+            case "3":
+            case 3:
+            case "WARN":
+            case enums/* LogLevelEnum */.Mb.WARN:
                 console.warn(logMessage);
                 break;
-            case api_constants/* default */.A.global.LOG_LEVEL_INFO:
+            case "2":
+            case 2:
+            case "INFO":
+            case enums/* LogLevelEnum */.Mb.INFO:
                 console.info(logMessage);
                 break;
-            case api_constants/* default */.A.global.LOG_LEVEL_DEBUG:
+            case "1":
+            case 1:
+            case "DEBUG":
+            case enums/* LogLevelEnum */.Mb.DEBUG:
                 if (console.debug) {
                     console.debug(logMessage);
                 }
@@ -1089,6 +1104,7 @@ var ScheduledCommit = (function () {
 
 
 
+
 var BaseAPI = (function () {
     function BaseAPI(error_codes, settings) {
         var _newTarget = this.constructor;
@@ -1105,6 +1121,9 @@ var BaseAPI = (function () {
         }
         this.apiLogLevel = this.settings.logLevel;
         this.selfReportSessionTime = this.settings.selfReportSessionTime;
+        if (this.apiLogLevel === undefined) {
+            this.apiLogLevel = enums/* LogLevelEnum */.Mb.NONE;
+        }
     }
     BaseAPI.prototype.commonReset = function (settings) {
         this.settings = (0,tslib_es6/* __assign */.Cl)((0,tslib_es6/* __assign */.Cl)({}, this.settings), settings);
@@ -1129,7 +1148,7 @@ var BaseAPI = (function () {
             returnValue = api_constants/* default */.A.global.SCORM_TRUE;
             this.processListeners(callbackName);
         }
-        this.apiLog(callbackName, "returned: " + returnValue, api_constants/* default */.A.global.LOG_LEVEL_INFO);
+        this.apiLog(callbackName, "returned: " + returnValue, enums/* LogLevelEnum */.Mb.INFO);
         this.clearSCORMError(returnValue);
         return returnValue;
     };
@@ -1181,7 +1200,7 @@ var BaseAPI = (function () {
                         this.processListeners(callbackName);
                         _a.label = 2;
                     case 2:
-                        this.apiLog(callbackName, "returned: " + returnValue, api_constants/* default */.A.global.LOG_LEVEL_INFO);
+                        this.apiLog(callbackName, "returned: " + returnValue, enums/* LogLevelEnum */.Mb.INFO);
                         this.clearSCORMError(returnValue);
                         return [2, returnValue];
                 }
@@ -1201,7 +1220,7 @@ var BaseAPI = (function () {
             }
             this.processListeners(callbackName, CMIElement);
         }
-        this.apiLog(callbackName, ": returned: " + returnValue, api_constants/* default */.A.global.LOG_LEVEL_INFO, CMIElement);
+        this.apiLog(callbackName, ": returned: " + returnValue, enums/* LogLevelEnum */.Mb.INFO, CMIElement);
         if (returnValue === undefined) {
             return "";
         }
@@ -1232,7 +1251,7 @@ var BaseAPI = (function () {
                 this.scheduleCommit(this.settings.autocommitSeconds * 1000, commitCallback);
             }
         }
-        this.apiLog(callbackName, ": " + value + ": result: " + returnValue, api_constants/* default */.A.global.LOG_LEVEL_INFO, CMIElement);
+        this.apiLog(callbackName, ": " + value + ": result: " + returnValue, enums/* LogLevelEnum */.Mb.INFO, CMIElement);
         this.clearSCORMError(returnValue);
         return returnValue;
     };
@@ -1243,7 +1262,6 @@ var BaseAPI = (function () {
             return (0,tslib_es6/* __generator */.YH)(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        console.log("commit");
                         this.clearScheduledCommit();
                         returnValue = api_constants/* default */.A.global.SCORM_FALSE;
                         if (!this.checkState(checkTerminated, this._error_codes.COMMIT_BEFORE_INIT, this._error_codes.COMMIT_AFTER_TERM)) return [3, 2];
@@ -1257,13 +1275,13 @@ var BaseAPI = (function () {
                             typeof result !== "undefined" && result.result
                                 ? result.result
                                 : api_constants/* default */.A.global.SCORM_FALSE;
-                        this.apiLog(callbackName, " Result: " + returnValue, api_constants/* default */.A.global.LOG_LEVEL_DEBUG, "HttpRequest");
+                        this.apiLog(callbackName, " Result: " + returnValue, enums/* LogLevelEnum */.Mb.DEBUG, "HttpRequest");
                         if (checkTerminated)
                             this.lastErrorCode = "0";
                         this.processListeners(callbackName);
                         _a.label = 2;
                     case 2:
-                        this.apiLog(callbackName, "returned: " + returnValue, api_constants/* default */.A.global.LOG_LEVEL_INFO);
+                        this.apiLog(callbackName, "returned: " + returnValue, enums/* LogLevelEnum */.Mb.INFO);
                         this.clearSCORMError(returnValue);
                         return [2, returnValue];
                 }
@@ -1273,7 +1291,7 @@ var BaseAPI = (function () {
     BaseAPI.prototype.getLastError = function (callbackName) {
         var returnValue = String(this.lastErrorCode);
         this.processListeners(callbackName);
-        this.apiLog(callbackName, "returned: " + returnValue, api_constants/* default */.A.global.LOG_LEVEL_INFO);
+        this.apiLog(callbackName, "returned: " + returnValue, enums/* LogLevelEnum */.Mb.INFO);
         return returnValue;
     };
     BaseAPI.prototype.getErrorString = function (callbackName, CMIErrorCode) {
@@ -1282,7 +1300,7 @@ var BaseAPI = (function () {
             returnValue = this.getLmsErrorMessageDetails(CMIErrorCode);
             this.processListeners(callbackName);
         }
-        this.apiLog(callbackName, "returned: " + returnValue, api_constants/* default */.A.global.LOG_LEVEL_INFO);
+        this.apiLog(callbackName, "returned: " + returnValue, enums/* LogLevelEnum */.Mb.INFO);
         return returnValue;
     };
     BaseAPI.prototype.getDiagnostic = function (callbackName, CMIErrorCode) {
@@ -1291,7 +1309,7 @@ var BaseAPI = (function () {
             returnValue = this.getLmsErrorMessageDetails(CMIErrorCode, true);
             this.processListeners(callbackName);
         }
-        this.apiLog(callbackName, "returned: " + returnValue, api_constants/* default */.A.global.LOG_LEVEL_INFO);
+        this.apiLog(callbackName, "returned: " + returnValue, enums/* LogLevelEnum */.Mb.INFO);
         return returnValue;
     };
     BaseAPI.prototype.checkState = function (checkTerminated, beforeInitError, afterTermError) {
@@ -1385,7 +1403,7 @@ var BaseAPI = (function () {
             }
         }
         if (returnValue === api_constants/* default */.A.global.SCORM_FALSE) {
-            this.apiLog(methodName, "There was an error setting the value for: ".concat(CMIElement, ", value of: ").concat(value), api_constants/* default */.A.global.LOG_LEVEL_WARNING);
+            this.apiLog(methodName, "There was an error setting the value for: ".concat(CMIElement, ", value of: ").concat(value), enums/* LogLevelEnum */.Mb.WARN);
         }
         return returnValue;
     };
@@ -1483,7 +1501,7 @@ var BaseAPI = (function () {
                 CMIElement: CMIElement,
                 callback: callback,
             });
-            this.apiLog("on", "Added event listener: ".concat(this.listenerArray.length), api_constants/* default */.A.global.LOG_LEVEL_INFO, functionName);
+            this.apiLog("on", "Added event listener: ".concat(this.listenerArray.length), enums/* LogLevelEnum */.Mb.INFO, functionName);
         }
     };
     BaseAPI.prototype.off = function (listenerName, callback) {
@@ -1506,7 +1524,7 @@ var BaseAPI = (function () {
             });
             if (removeIndex !== -1) {
                 this_1.listenerArray.splice(removeIndex, 1);
-                this_1.apiLog("off", "Removed event listener: ".concat(this_1.listenerArray.length), api_constants/* default */.A.global.LOG_LEVEL_INFO, functionName);
+                this_1.apiLog("off", "Removed event listener: ".concat(this_1.listenerArray.length), enums/* LogLevelEnum */.Mb.INFO, functionName);
             }
         };
         var this_1 = this;
@@ -1539,7 +1557,7 @@ var BaseAPI = (function () {
         }
     };
     BaseAPI.prototype.processListeners = function (functionName, CMIElement, value) {
-        this.apiLog(functionName, value, api_constants/* default */.A.global.LOG_LEVEL_INFO, CMIElement);
+        this.apiLog(functionName, value, enums/* LogLevelEnum */.Mb.INFO, CMIElement);
         for (var i = 0; i < this.listenerArray.length; i++) {
             var listener = this.listenerArray[i];
             var functionsMatch = listener.functionName === functionName;
@@ -1555,7 +1573,7 @@ var BaseAPI = (function () {
                 CMIElementsMatch = listener.CMIElement === CMIElement;
             }
             if (functionsMatch && (!listenerHasCMIElement || CMIElementsMatch)) {
-                this.apiLog("processListeners", "Processing listener: ".concat(listener.functionName), api_constants/* default */.A.global.LOG_LEVEL_INFO, CMIElement);
+                this.apiLog("processListeners", "Processing listener: ".concat(listener.functionName), enums/* LogLevelEnum */.Mb.INFO, CMIElement);
                 listener.callback(CMIElement, value);
             }
         }
@@ -1564,7 +1582,7 @@ var BaseAPI = (function () {
         if (!message) {
             message = this.getLmsErrorMessageDetails(errorNumber);
         }
-        this.apiLog("throwSCORMError", errorNumber + ": " + message, api_constants/* default */.A.global.LOG_LEVEL_ERROR);
+        this.apiLog("throwSCORMError", errorNumber + ": " + message, enums/* LogLevelEnum */.Mb.ERROR);
         this.lastErrorCode = String(errorNumber);
     };
     BaseAPI.prototype.clearSCORMError = function (success) {
@@ -1715,7 +1733,7 @@ var BaseAPI = (function () {
                                         return [2, this.transformResponse(response)];
                                     case 2:
                                         e_1 = _a.sent();
-                                        this.apiLog("processHttpRequest", e_1, api_constants/* default */.A.global.LOG_LEVEL_ERROR);
+                                        this.apiLog("processHttpRequest", e_1, enums/* LogLevelEnum */.Mb.ERROR);
                                         api.processListeners("CommitError");
                                         return [2, genericError];
                                     case 3: return [2];
@@ -1731,14 +1749,14 @@ var BaseAPI = (function () {
     BaseAPI.prototype.scheduleCommit = function (when, callback) {
         if (!this._timeout) {
             this._timeout = new ScheduledCommit(this, when, callback);
-            this.apiLog("scheduleCommit", "scheduled", api_constants/* default */.A.global.LOG_LEVEL_DEBUG, "");
+            this.apiLog("scheduleCommit", "scheduled", enums/* LogLevelEnum */.Mb.DEBUG, "");
         }
     };
     BaseAPI.prototype.clearScheduledCommit = function () {
         if (this._timeout) {
             this._timeout.cancel();
             this._timeout = undefined;
-            this.apiLog("clearScheduledCommit", "cleared", api_constants/* default */.A.global.LOG_LEVEL_DEBUG, "");
+            this.apiLog("clearScheduledCommit", "cleared", enums/* LogLevelEnum */.Mb.DEBUG, "");
         }
     };
     BaseAPI.prototype._checkObjectHasProperty = function (refObject, attribute) {
@@ -1767,7 +1785,7 @@ var BaseAPI = (function () {
         var commitObject = this.settings.renderCommonCommitFields
             ? this.renderCommitObject(shouldTerminateCommit)
             : this.renderCommitCMI(shouldTerminateCommit);
-        if (this.apiLogLevel === api_constants/* default */.A.global.LOG_LEVEL_DEBUG) {
+        if ([enums/* LogLevelEnum */.Mb.DEBUG, "1", 1, "DEBUG"].includes(this.apiLogLevel)) {
             console.debug("Commit (terminated: " + (terminateCommit ? "yes" : "no") + "): ");
             console.debug(commitObject);
         }
@@ -4044,11 +4062,12 @@ var Scorm2004Impl = (function (_super) {
     Scorm2004Impl.prototype.internalFinish = function () {
         return (0,tslib_es6/* __awaiter */.sH)(this, void 0, void 0, function () {
             var result, navActions, request, choiceJumpRegex, matches, target, action;
-            return (0,tslib_es6/* __generator */.YH)(this, function (_a) {
-                switch (_a.label) {
+            var _a, _b, _c, _d;
+            return (0,tslib_es6/* __generator */.YH)(this, function (_e) {
+                switch (_e.label) {
                     case 0: return [4, this.terminate("Terminate", true)];
                     case 1:
-                        result = _a.sent();
+                        result = _e.sent();
                         if (result === api_constants/* default */.A.global.SCORM_TRUE) {
                             if (this.adl.nav.request !== "_none_") {
                                 navActions = {
@@ -4065,9 +4084,15 @@ var Scorm2004Impl = (function (_super) {
                                 choiceJumpRegex = new RegExp(regex/* default */.A.scorm2004.NAVEvent);
                                 matches = request.match(choiceJumpRegex);
                                 target = "";
-                                if (matches && matches.length > 2) {
-                                    target = matches[2];
-                                    request = matches[1].replace(target, "");
+                                if (matches) {
+                                    if ((_a = matches.groups) === null || _a === void 0 ? void 0 : _a.choice_target) {
+                                        target = (_b = matches.groups) === null || _b === void 0 ? void 0 : _b.choice_target;
+                                        request = "choice";
+                                    }
+                                    else if ((_c = matches.groups) === null || _c === void 0 ? void 0 : _c.jump_target) {
+                                        target = (_d = matches.groups) === null || _d === void 0 ? void 0 : _d.jump_target;
+                                        request = "jump";
+                                    }
                                 }
                                 action = navActions[request];
                                 if (action) {
@@ -4457,7 +4482,6 @@ var Scorm2004Impl = (function (_super) {
                         navRequest = false;
                         if (this.adl.nav.request !== ((_c = (_b = (_a = this.startingData) === null || _a === void 0 ? void 0 : _a.adl) === null || _b === void 0 ? void 0 : _b.nav) === null || _c === void 0 ? void 0 : _c.request) &&
                             this.adl.nav.request !== "_none_") {
-                            this.adl.nav.request = encodeURIComponent(this.adl.nav.request);
                             navRequest = true;
                         }
                         commitObject = this.getCommitObject(terminateCommit);
@@ -5823,11 +5847,6 @@ var global = {
     STATE_NOT_INITIALIZED: 0,
     STATE_INITIALIZED: 1,
     STATE_TERMINATED: 2,
-    LOG_LEVEL_DEBUG: 1,
-    LOG_LEVEL_INFO: 2,
-    LOG_LEVEL_WARNING: 3,
-    LOG_LEVEL_ERROR: 4,
-    LOG_LEVEL_NONE: 5,
 };
 var scorm12 = {
     cmi_children: "core,suspend_data,launch_data,comments,objectives,student_data,student_preference,interactions",
@@ -6031,6 +6050,7 @@ var APIConstants = {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   K$: function() { return /* binding */ NAVBoolean; },
+/* harmony export */   Mb: function() { return /* binding */ LogLevelEnum; },
 /* harmony export */   YE: function() { return /* binding */ SuccessStatus; },
 /* harmony export */   lC: function() { return /* binding */ CompletionStatus; }
 /* harmony export */ });
@@ -6052,6 +6072,15 @@ var CompletionStatus;
     CompletionStatus["incomplete"] = "incomplete";
     CompletionStatus["unknown"] = "unknown";
 })(CompletionStatus || (CompletionStatus = {}));
+var LogLevelEnum;
+(function (LogLevelEnum) {
+    LogLevelEnum[LogLevelEnum["_"] = 0] = "_";
+    LogLevelEnum[LogLevelEnum["DEBUG"] = 1] = "DEBUG";
+    LogLevelEnum[LogLevelEnum["INFO"] = 2] = "INFO";
+    LogLevelEnum[LogLevelEnum["WARN"] = 3] = "WARN";
+    LogLevelEnum[LogLevelEnum["ERROR"] = 4] = "ERROR";
+    LogLevelEnum[LogLevelEnum["NONE"] = 5] = "NONE";
+})(LogLevelEnum || (LogLevelEnum = {}));
 
 
 /***/ }),
@@ -6160,7 +6189,7 @@ var scorm2004 = {
     CMIExit: "^(time-out|suspend|logout|normal)$",
     CMIType: "^(true-false|choice|fill-in|long-fill-in|matching|performance|sequencing|likert|numeric|other)$",
     CMIResult: "^(correct|incorrect|unanticipated|neutral|-?([0-9]{1,4})(\\.[0-9]{1,18})?)$",
-    NAVEvent: "^(previous|continue|exit|exitAll|abandon|abandonAll|suspendAll|_none_|(\\{target=\\S{0,}[a-zA-Z0-9-_]+})?choice|(\\{target=\\S{0,}[a-zA-Z0-9-_]+})?jump)$",
+    NAVEvent: "^(previous|continue|exit|exitAll|abandon|abandonAll|suspendAll|_none_|(\\{target=(?<choice_target>\\S{0,}[a-zA-Z0-9-_]+)})?choice|(\\{target=(?<jump_target>\\S{0,}[a-zA-Z0-9-_]+)})?jump)$",
     NAVBoolean: "^(unknown|true|false$)",
     NAVTarget: "^{target=\\S{0,}[a-zA-Z0-9-_]+}$",
     scaled_range: "-1#1",
@@ -6211,9 +6240,6 @@ var BaseScormValidationError = (function (_super) {
         enumerable: false,
         configurable: true
     });
-    BaseScormValidationError.prototype.setMessage = function (message) {
-        this.message = message;
-    };
     return BaseScormValidationError;
 }(Error));
 
@@ -6222,7 +6248,7 @@ var ValidationError = (function (_super) {
     function ValidationError(errorCode, errorMessage, detailedMessage) {
         var _this = _super.call(this, errorCode) || this;
         _this._detailedMessage = "";
-        _this.setMessage(errorMessage);
+        _this.message = errorMessage;
         _this._errorMessage = errorMessage;
         if (detailedMessage) {
             _this._detailedMessage = detailedMessage;