scorm-again 3.0.4 → 3.0.5

package/dist/esm/scorm2004.js

@@ -940,6 +940,11 @@ const scorm2004_regex = {
   progress_range: "0#1"
 };
 
+const PERFORMANCE_STEP_NAME = "^$|" + scorm2004_regex.CMIShortIdentifier;
+const PERFORMANCE_CHARACTERSTRING = "(?![\\s\\S]*(?:\\[,\\]|\\[\\.\\]|\\[:\\]))[\\s\\S]{1,250}";
+const PERFORMANCE_NUMERIC_RANGE = "(?:-?\\d+(?:\\.\\d+)?)?\\[:\\](?:-?\\d+(?:\\.\\d+)?)?";
+const CR_PERFORMANCE_STEP_ANSWER = "^(?:|" + PERFORMANCE_NUMERIC_RANGE + "|" + PERFORMANCE_CHARACTERSTRING + ")$";
+const LR_PERFORMANCE_STEP_ANSWER = "^(?:|" + PERFORMANCE_CHARACTERSTRING + ")$";
 const LearnerResponses = {
   "true-false": {
     format: "^true$|^false$",
@@ -974,8 +979,8 @@ const LearnerResponses = {
     unique: false
   },
   performance: {
-    format: "^$|" + scorm2004_regex.CMIShortIdentifier,
-    format2: scorm2004_regex.CMIDecimal + "|^$|" + scorm2004_regex.CMIShortIdentifier,
+    format: PERFORMANCE_STEP_NAME,
+    format2: LR_PERFORMANCE_STEP_ANSWER,
     max: 250,
     delimiter: "[,]",
     delimiter2: "[.]",
@@ -1051,10 +1056,10 @@ const CorrectResponses = {
     delimiter2: "[.]",
     unique: false,
     duplicate: false,
-    // step_name must be a non-empty short identifier
-    format: scorm2004_regex.CMIShortIdentifier,
-    // step_answer may be short identifier or numeric range (<decimal>[:<decimal>])
-    format2: `^(${scorm2004_regex.CMIShortIdentifier})$|^(?:\\d+(?:\\.\\d+)?(?::\\d+(?:\\.\\d+)?)?)$`
+    // step_name: optional short_identifier_type
+    format: PERFORMANCE_STEP_NAME,
+    // step_answer: optional characterstring (spaces allowed) or numeric range
+    format2: CR_PERFORMANCE_STEP_ANSWER
   },
   sequencing: {
     max: 36,
@@ -5363,7 +5368,19 @@ class CMIValueAccessService {
     if (!scorm2004) {
       if (isFinalAttribute) {
         if (typeof attribute === "undefined" || !this.context.checkObjectHasProperty(refObject, attribute)) {
-          this.context.throwSCORMError(CMIElement, invalidErrorCode, invalidErrorMessage);
+          if (attribute === "_children") {
+            this.context.throwSCORMError(
+              CMIElement,
+              getErrorCode(this.context.errorCodes, "CHILDREN_ERROR")
+            );
+          } else if (attribute === "_count") {
+            this.context.throwSCORMError(
+              CMIElement,
+              getErrorCode(this.context.errorCodes, "COUNT_ERROR")
+            );
+          } else {
+            this.context.throwSCORMError(CMIElement, invalidErrorCode, invalidErrorMessage);
+          }
           return { error: true };
         }
       }
@@ -15767,7 +15784,8 @@ class BaseAPI {
       if (errorCode === 143) returnValue = global_constants.SCORM_FALSE;
     } else {
       const result = this.storeData(false);
-      if ((result.errorCode ?? 0) > 0) {
+      const errorCode = result.errorCode ?? 0;
+      if (errorCode > 0) {
         if (result.errorMessage) {
           this.apiLog(
             "commit",
@@ -15782,12 +15800,12 @@ class BaseAPI {
             LogLevelEnum.DEBUG
           );
         }
-        this.throwSCORMError("api", result.errorCode);
+        this.throwSCORMError("api", errorCode);
       }
       const resultValue = result?.result ?? global_constants.SCORM_FALSE;
       returnValue = typeof resultValue === "boolean" ? String(resultValue) : resultValue;
       this.apiLog(callbackName, " Result: " + returnValue, LogLevelEnum.DEBUG, "HttpRequest");
-      if (checkTerminated) this.lastErrorCode = "0";
+      if (checkTerminated && errorCode === 0) this.lastErrorCode = "0";
       this.processListeners(callbackName);
       if (this.settings.enableOfflineSupport && this._offlineStorageService && this._offlineStorageService.isDeviceOnline() && this._courseId) {
         this._offlineStorageService.hasPendingOfflineData(this._courseId).then((hasPendingData) => {
@@ -16559,6 +16577,49 @@ class CMILearnerPreference extends BaseCMI {
   }
 }
 
+function stripBrackets(delim) {
+  return delim.replace(/[[\]]/g, "");
+}
+function escapeRegex(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function splitDelimited(value, bracketed) {
+  if (!bracketed) {
+    return [value];
+  }
+  if (value.includes(bracketed)) {
+    return value.split(bracketed);
+  }
+  const bare = stripBrackets(bracketed);
+  if (!bare) {
+    return [value];
+  }
+  const splitRe = new RegExp(`(?<!\\\\)${escapeRegex(bare)}`, "g");
+  const unescapeRe = new RegExp(`\\\\${escapeRegex(bare)}`, "g");
+  return value.split(splitRe).map((part) => part.replace(unescapeRe, bare));
+}
+function splitFirstDelimited(value, bracketed) {
+  if (!bracketed) {
+    return [value];
+  }
+  if (value.includes(bracketed)) {
+    const idx = value.indexOf(bracketed);
+    return [value.slice(0, idx), value.slice(idx + bracketed.length)];
+  }
+  const bare = stripBrackets(bracketed);
+  if (!bare) {
+    return [value];
+  }
+  const splitRe = new RegExp(`(?<!\\\\)${escapeRegex(bare)}`);
+  const unescapeRe = new RegExp(`\\\\${escapeRegex(bare)}`, "g");
+  const parts = value.split(splitRe);
+  const first = (parts[0] ?? "").replace(unescapeRe, bare);
+  if (parts.length === 1) {
+    return [first];
+  }
+  return [first, parts.slice(1).join(bare).replace(unescapeRe, bare)];
+}
+
 class CMIInteractions extends CMIArray {
   /**
    * Constructor for `cmi.interactions` Array
@@ -16768,8 +16829,7 @@ class CMIInteractionsObject extends BaseCMI {
       const response_type = LearnerResponses[this.type];
       if (response_type) {
         if (response_type?.delimiter) {
-          const delimiter = response_type.delimiter === "[,]" ? "," : response_type.delimiter;
-          nodes = learner_response.split(delimiter);
+          nodes = splitDelimited(learner_response, response_type.delimiter);
         } else {
           nodes[0] = learner_response;
         }
@@ -16777,10 +16837,10 @@ class CMIInteractionsObject extends BaseCMI {
           const formatRegex = new RegExp(response_type.format);
           for (let i = 0; i < nodes.length; i++) {
             if (response_type?.delimiter2) {
-              const delimiter2 = response_type.delimiter2 === "[.]" ? "." : response_type.delimiter2;
-              const values = nodes[i]?.split(delimiter2);
+              const node = nodes[i] ?? "";
+              const values = this.type === "performance" ? splitFirstDelimited(node, response_type.delimiter2) : splitDelimited(node, response_type.delimiter2);
               if (values?.length === 2) {
-                if (this.type === "performance" && (values[0] === "" || values[1] === "")) {
+                if (this.type === "performance" && values[0] === "" && values[1] === "") {
                   throw new Scorm2004ValidationError(
                     this._cmi_element + ".learner_response",
                     scorm2004_errors.TYPE_MISMATCH
@@ -16999,30 +17059,13 @@ class CMIInteractionsObjectivesObject extends BaseCMI {
     return result;
   }
 }
-function stripBrackets(delim) {
-  return delim.replace(/[[\]]/g, "");
-}
-function escapeRegex(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-function splitUnescaped(text, delim) {
-  const reDelim = escapeRegex(delim);
-  const splitRe = new RegExp(`(?<!\\\\)${reDelim}`, "g");
-  const unescapeRe = new RegExp(`\\\\${reDelim}`, "g");
-  return text.split(splitRe).map((part) => part.replace(unescapeRe, delim));
-}
-function splitFirstUnescaped(text, delim) {
-  const reDelim = escapeRegex(delim);
-  const splitRe = new RegExp(`(?<!\\\\)${reDelim}`);
-  const unescapeRe = new RegExp(`\\\\${reDelim}`, "g");
-  const parts = text.split(splitRe);
-  const firstPart = parts[0] ?? "";
-  if (parts.length === 1) {
-    return [firstPart.replace(unescapeRe, delim)];
+const RESPONSE_PREFIX_RE = /^\{(?:lang|case_matters|order_matters)=[^}]+\}/;
+function stripResponsePrefixes(node) {
+  let result = node;
+  while (RESPONSE_PREFIX_RE.test(result)) {
+    result = result.replace(RESPONSE_PREFIX_RE, "");
   }
-  const part1 = firstPart.replace(unescapeRe, delim);
-  const part2 = parts.slice(1).join(delim).replace(unescapeRe, delim);
-  return [part1, part2];
+  return result;
 }
 function validatePattern(type, pattern, responseDef) {
   if (pattern.trim() !== pattern) {
@@ -17031,8 +17074,7 @@ function validatePattern(type, pattern, responseDef) {
       scorm2004_errors.TYPE_MISMATCH
     );
   }
-  const subDelim1 = responseDef.delimiter ? stripBrackets(responseDef.delimiter) : null;
-  const rawNodes = subDelim1 ? splitUnescaped(pattern, subDelim1) : [pattern];
+  const rawNodes = responseDef.delimiter ? splitDelimited(pattern, responseDef.delimiter) : [pattern];
   for (const raw of rawNodes) {
     if (raw.trim() !== raw) {
       throw new Scorm2004ValidationError(
@@ -17044,20 +17086,14 @@ function validatePattern(type, pattern, responseDef) {
   if (type === "fill-in" && pattern === "") {
     return;
   }
-  const delim1 = responseDef.delimiter ? stripBrackets(responseDef.delimiter) : null;
-  let nodes;
-  if (delim1) {
-    nodes = splitUnescaped(pattern, delim1);
-  } else {
-    nodes = [pattern];
-  }
+  const nodes = responseDef.delimiter ? splitDelimited(pattern, responseDef.delimiter) : [pattern];
   if (!responseDef.delimiter && pattern.includes(",")) {
     throw new Scorm2004ValidationError(
       "cmi.interactions.n.correct_responses.n.pattern",
       scorm2004_errors.TYPE_MISMATCH
     );
   }
-  if (responseDef.unique || responseDef.duplicate === false) {
+  if (type !== "numeric" && (responseDef.unique || responseDef.duplicate === false)) {
     const seen = new Set(nodes);
     if (seen.size !== nodes.length) {
       throw new Scorm2004ValidationError(
@@ -17089,8 +17125,7 @@ function validatePattern(type, pattern, responseDef) {
         scorm2004_errors.TYPE_MISMATCH
       );
     }
-    const delim = stripBrackets(delimBracketed);
-    const parts = value.split(new RegExp(`(?<!\\\\)${escapeRegex(delim)}`, "g")).map((n) => n.replace(new RegExp(`\\\\${escapeRegex(delim)}`, "g"), delim));
+    const parts = splitDelimited(value, delimBracketed);
     if (parts.length !== 2 || parts[0] === "" || parts[1] === "") {
       throw new Scorm2004ValidationError(
         "cmi.interactions.n.correct_responses.n.pattern",
@@ -17107,15 +17142,17 @@ function validatePattern(type, pattern, responseDef) {
   for (const node of nodes) {
     switch (type) {
       case "numeric": {
-        const numDelim = responseDef.delimiter ? stripBrackets(responseDef.delimiter) : ":";
-        const nums = node.split(numDelim);
-        if (nums.length < 1 || nums.length > 2) {
-          throw new Scorm2004ValidationError(
-            "cmi.interactions.n.correct_responses.n.pattern",
-            scorm2004_errors.TYPE_MISMATCH
-          );
+        if (node === "") {
+          const bracketedRange = nodes.length >= 2 && !!responseDef.delimiter && pattern.includes(responseDef.delimiter);
+          if (!bracketedRange) {
+            throw new Scorm2004ValidationError(
+              "cmi.interactions.n.correct_responses.n.pattern",
+              scorm2004_errors.TYPE_MISMATCH
+            );
+          }
+          break;
         }
-        nums.forEach(checkSingle);
+        checkSingle(node);
         break;
       }
       case "performance": {
@@ -17126,8 +17163,8 @@ function validatePattern(type, pattern, responseDef) {
             scorm2004_errors.TYPE_MISMATCH
           );
         }
-        const delim = stripBrackets(delimBracketed);
-        const parts = splitFirstUnescaped(node, delim);
+        const record = stripResponsePrefixes(node);
+        const parts = splitFirstDelimited(record, delimBracketed);
         if (parts.length !== 2) {
           throw new Scorm2004ValidationError(
             "cmi.interactions.n.correct_responses.n.pattern",
@@ -17135,7 +17172,7 @@ function validatePattern(type, pattern, responseDef) {
           );
         }
         const [part1, part2] = parts;
-        if (part1 === "" || part2 === "" || part1 === part2) {
+        if (part1 === "" && part2 === "") {
           throw new Scorm2004ValidationError(
             "cmi.interactions.n.correct_responses.n.pattern",
             scorm2004_errors.TYPE_MISMATCH
@@ -20199,7 +20236,7 @@ class Scorm2004ResponseValidator {
   checkValidResponseType(CMIElement, response_type, value, interaction_type) {
     let nodes = [];
     if (response_type?.delimiter) {
-      nodes = String(value).split(response_type.delimiter);
+      nodes = splitDelimited(String(value), response_type.delimiter);
     } else {
       nodes[0] = value;
     }
@@ -20321,22 +20358,30 @@ class Scorm2004ResponseValidator {
         nodes[i] = this.removeCorrectResponsePrefixes(CMIElement, nodes[i]);
       }
       if (response?.delimiter2) {
-        const values = nodes[i].split(response.delimiter2);
+        const values = interaction_type === "performance" ? splitFirstDelimited(nodes[i], response.delimiter2) : splitDelimited(nodes[i], response.delimiter2);
         if (values.length === 2) {
-          const matches = values[0].match(formatRegex);
-          if (!matches) {
+          if (interaction_type === "performance" && values[0] === "" && values[1] === "") {
             this.context.throwSCORMError(
               CMIElement,
               scorm2004_errors.TYPE_MISMATCH,
               `${interaction_type}: ${value}`
             );
           } else {
-            if (!response.format2 || !values[1].match(new RegExp(response.format2))) {
+            const matches = values[0]?.match(formatRegex);
+            if (!matches) {
               this.context.throwSCORMError(
                 CMIElement,
                 scorm2004_errors.TYPE_MISMATCH,
                 `${interaction_type}: ${value}`
               );
+            } else {
+              if (!response.format2 || !values[1]?.match(new RegExp(response.format2))) {
+                this.context.throwSCORMError(
+                  CMIElement,
+                  scorm2004_errors.TYPE_MISMATCH,
+                  `${interaction_type}: ${value}`
+                );
+              }
             }
           }
         } else {
@@ -20347,6 +20392,9 @@ class Scorm2004ResponseValidator {
           );
         }
       } else {
+        if (interaction_type === "numeric" && nodes.length > 1 && nodes[i] === "" && !!response.delimiter && String(value).includes(response.delimiter)) {
+          continue;
+        }
         const matches = nodes[i].match(formatRegex);
         if (!matches && value !== "" || !matches && interaction_type === "true-false") {
           this.context.throwSCORMError(
@@ -20356,7 +20404,7 @@ class Scorm2004ResponseValidator {
           );
         } else {
           if (interaction_type === "numeric" && nodes.length > 1) {
-            if (Number(nodes[0]) > Number(nodes[1])) {
+            if (nodes[0] !== "" && nodes[1] !== "" && Number(nodes[0]) > Number(nodes[1])) {
               this.context.throwSCORMError(
                 CMIElement,
                 scorm2004_errors.TYPE_MISMATCH,