cleanup: Separate Context.../ResultExtension, run prettier.

src/AbstractCmi5.ts

@@ -45,7 +45,10 @@ import {
 
 export * from "./interfaces";
 
-function _applyTransform(mergedStatement: Statement, options: SendStatementOptions) {
+function _applyTransform(
+  mergedStatement: Statement,
+  options: SendStatementOptions
+) {
   return options && typeof options.transform === "function"
     ? options.transform(mergedStatement)
     : mergedStatement;

src/Cmi5Statements.ts

@@ -26,11 +26,13 @@ import {
 } from "./interfaces";
 import {
   Cmi5ContextActivity,
-  Cmi5DefinedVerbs, Cmi5Extension, Cmi5InteractionIRI,
+  Cmi5DefinedVerbs,
+  Cmi5ContextExtension,
+  Cmi5InteractionIRI,
   Cmi5InteractionType,
+  Cmi5ResultExtension,
 } from "./constants";
 
-
 export function Cmi5DefinedStatement(
   ctx: LaunchContext,
   statement: Partial<Statement>
@@ -116,7 +118,7 @@ export function Cmi5PassStatement(
   score?: ResultScore | number,
   objectiveOrOptions?: ObjectiveActivity | PassOptions
 ): Statement {
-  const masteryScore = ctx.launchData.masteryScore
+  const masteryScore = ctx.launchData.masteryScore;
   // 10.0 xAPI State Data Model - https://github.com/AICC/CMI-5_Spec_Current/blob/quartz/cmi5_spec.md#100-xapi-state-data-model
   if (ctx.launchData.launchMode !== "Normal")
     throw new Error("Can only send PASSED when launchMode is 'Normal'");
@@ -148,15 +150,15 @@ export function Cmi5PassStatement(
         ...(objective ? { parent: [objective] } : {}),
       },
       ...(masteryScore
-        ? { extensions: { [Cmi5Extension.MASTERY_SCORE]: masteryScore } }
+        ? { extensions: { [Cmi5ContextExtension.MASTERY_SCORE]: masteryScore } }
         : {}),
     },
   });
 }
 
 export function Cmi5FailStatement(
   ctx: LaunchContext,
-  score?: ResultScore | number,
+  score?: ResultScore | number
 ): Statement {
   // 10.0 xAPI State Data Model - https://github.com/AICC/CMI-5_Spec_Current/blob/quartz/cmi5_spec.md#100-xapi-state-data-model
   if (ctx.launchData.launchMode !== "Normal")
@@ -182,8 +184,7 @@ export function Cmi5FailStatement(
       ...(ctx.launchData.masteryScore
         ? {
             extensions: {
-              [Cmi5Extension.MASTERY_SCORE]:
-                ctx.launchData.masteryScore,
+              [Cmi5ContextExtension.MASTERY_SCORE]: ctx.launchData.masteryScore,
             },
           }
         : {}),
@@ -215,7 +216,7 @@ export function Cmi5ProgressStatement(
     },
     result: {
       extensions: {
-        [Cmi5Extension.PROGRESS]: percent,
+        [Cmi5ResultExtension.PROGRESS]: percent,
       },
     },
   });
@@ -615,9 +616,7 @@ export function Cmi5InteractionOtherStatement(
     {
       type: Cmi5InteractionIRI,
       interactionType: "other",
-      ...(correctAnswer
-        ? { correctResponsesPattern: [correctAnswer] }
-        : {}),
+      ...(correctAnswer ? { correctResponsesPattern: [correctAnswer] } : {}),
       ...(name ? { name } : {}),
       ...(description ? { description } : {}),
     },
@@ -663,7 +662,6 @@ export function Cmi5InteractionStatement(
   });
 }
 
-
 // Helper/utility functions
 
 // Formatting
@@ -724,8 +722,9 @@ function _isNumericRange(candidate: unknown): candidate is NumericRange {
   );
 }
 
-function _didMeetMasteryScore(masteryScore: number, rScore?: ResultScore): boolean {
-  return rScore &&
-    _isNumber(rScore.scaled) &&
-    rScore.scaled >= masteryScore;
+function _didMeetMasteryScore(
+  masteryScore: number,
+  rScore?: ResultScore
+): boolean {
+  return rScore && _isNumber(rScore.scaled) && rScore.scaled >= masteryScore;
 }

src/constants/Cmi5ContextExtension.ts

@@ -0,0 +1,4 @@
+export class Cmi5ContextExtension {
+  public static readonly MASTERY_SCORE =
+    "https://w3id.org/xapi/cmi5/context/extensions/masteryscore";
+}

src/constants/Cmi5InteractionType.ts

@@ -1,4 +1,5 @@
-export const Cmi5InteractionIRI = "http://adlnet.gov/expapi/activities/cmi.interaction" as const;
+export const Cmi5InteractionIRI =
+  "http://adlnet.gov/expapi/activities/cmi.interaction" as const;
 
 export class Cmi5InteractionType {
   public static readonly TRUE_FALSE = "true-false";

src/constants/Cmi5ResultExtension.ts

@@ -0,0 +1,4 @@
+export class Cmi5ResultExtension {
+  public static readonly PROGRESS =
+    "https://w3id.org/xapi/cmi5/result/extensions/progress";
+}

src/constants/index.ts

@@ -1,4 +1,5 @@
 export * from "./Cmi5ContextActivity";
+export * from "./Cmi5ContextExtension";
 export * from "./Cmi5DefinedVerbs";
-export * from "./Cmi5Extension";
 export * from "./Cmi5InteractionType";
+export * from "./Cmi5ResultExtension";