@playcademy/vite-plugin 0.1.34 → 0.1.36

package/dist/index.js

@@ -41199,7 +41199,7 @@ var import_picocolors7 = __toESM(require_picocolors(), 1);
 // package.json
 var package_default = {
   name: "@playcademy/vite-plugin",
-  version: "0.1.33",
+  version: "0.1.35",
   type: "module",
   exports: {
     ".": {
@@ -190550,14 +190550,30 @@ function createOneRosterNamespace(client2) {
       update: async (sourcedId, data) => {
         return client2["request"](`${ONEROSTER_ENDPOINTS.assessmentResults}/${sourcedId}`, "PUT", data);
       },
-      getLatestForStudent: async (studentId, lineItemId) => {
+      getAttemptStats: async (studentId, lineItemId) => {
         try {
           const filter2 = `student.sourcedId='${studentId}' AND assessmentLineItem.sourcedId='${lineItemId}'`;
-          const url = `${ONEROSTER_ENDPOINTS.assessmentResults}?filter=${encodeURIComponent(filter2)}&sort=scoreDate&orderBy=desc&limit=1`;
+          const url = `${ONEROSTER_ENDPOINTS.assessmentResults}?filter=${encodeURIComponent(filter2)}`;
           const response = await client2["request"](url, "GET");
-          return response.assessmentResults[0] || null;
+          const results = response.assessmentResults || [];
+          if (results.length === 0)
+            return null;
+          let maxAttemptResult = results[0];
+          let maxAttemptNumber = maxAttemptResult.metadata?.attemptNumber || 0;
+          let activeAttemptCount = 0;
+          for (const result of results) {
+            const attemptNumber = result.metadata?.attemptNumber || 0;
+            if (attemptNumber > maxAttemptNumber) {
+              maxAttemptNumber = attemptNumber;
+              maxAttemptResult = result;
+            }
+            if (result.status === "active") {
+              activeAttemptCount++;
+            }
+          }
+          return { maxAttemptNumber, activeAttemptCount, maxAttemptResult };
         } catch (error2) {
-          logTimebackError("query latest assessment result", error2, {
+          logTimebackError("query attempt stats", error2, {
             studentId,
             lineItemId
           });
@@ -190895,9 +190911,6 @@ class TimebackCacheManager {
     log32.debug("[TimebackCacheManager] Cache cleanup completed");
   }
 }
-function kebabToTitleCase(kebabStr) {
-  return kebabStr.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
-}
 init_constants();
 init_constants();
 var isObject2 = (value) => typeof value === "object" && value !== null;
@@ -190910,6 +190923,152 @@ function isPlaycademyResourceMetadata(value) {
   }
   return isObject2(value.mastery);
 }
+
+class MasteryTracker {
+  cacheManager;
+  onerosterNamespace;
+  edubridgeNamespace;
+  constructor(cacheManager, onerosterNamespace, edubridgeNamespace) {
+    this.cacheManager = cacheManager;
+    this.onerosterNamespace = onerosterNamespace;
+    this.edubridgeNamespace = edubridgeNamespace;
+  }
+  async checkProgress(input) {
+    const { studentId, courseId, resourceId, masteredUnits } = input;
+    if (typeof masteredUnits !== "number" || masteredUnits <= 0) {
+      return;
+    }
+    const masterableUnits = await this.resolveMasterableUnits(resourceId);
+    if (!masterableUnits || masterableUnits <= 0) {
+      log32.warn("[MasteryTracker] No masterableUnits configured for course", {
+        courseId,
+        resourceId
+      });
+      return;
+    }
+    const facts = await this.fetchEnrollmentAnalyticsFacts(studentId, courseId);
+    if (!facts) {
+      log32.warn("[MasteryTracker] Unable to retrieve analytics for mastery-based completion", {
+        studentId,
+        courseId
+      });
+      return;
+    }
+    const historicalMasteredUnits = this.sumAnalyticsMetric(facts, "masteredUnits");
+    const totalMastered = historicalMasteredUnits + masteredUnits;
+    const rawPct = totalMastered / masterableUnits * 100;
+    const pctCompleteApp = Math.min(100, Math.max(0, Math.round(rawPct)));
+    const masteryAchieved = totalMastered >= masterableUnits;
+    return { pctCompleteApp, masteryAchieved };
+  }
+  async createCompletionEntry(studentId, courseId, classId, appName) {
+    const ids = deriveSourcedIds(courseId);
+    const lineItemId = `${ids.course}-mastery-completion-assessment`;
+    const resultId = `${lineItemId}:${studentId}:completion`;
+    try {
+      await this.onerosterNamespace.assessmentLineItems.findOrCreate(lineItemId, {
+        sourcedId: lineItemId,
+        title: "Mastery Completion",
+        status: ONEROSTER_STATUS.active,
+        ...classId ? { class: { sourcedId: classId } } : { course: { sourcedId: ids.course } },
+        ...ids.componentResource ? { componentResource: { sourcedId: ids.componentResource } } : {}
+      });
+      await this.onerosterNamespace.assessmentResults.upsert(resultId, {
+        sourcedId: resultId,
+        status: ONEROSTER_STATUS.active,
+        assessmentLineItem: { sourcedId: lineItemId },
+        student: { sourcedId: studentId },
+        score: 100,
+        scoreDate: new Date().toISOString(),
+        scoreStatus: SCORE_STATUS.fullyGraded,
+        inProgress: "false",
+        metadata: {
+          isMasteryCompletion: true,
+          completedAt: new Date().toISOString(),
+          appName
+        }
+      });
+      log32.info("[MasteryTracker] Created mastery completion entry", {
+        studentId,
+        lineItemId,
+        resultId
+      });
+    } catch (error2) {
+      log32.error("[MasteryTracker] Failed to create mastery completion entry", {
+        studentId,
+        lineItemId,
+        error: error2
+      });
+    }
+  }
+  async resolveMasterableUnits(resourceId) {
+    if (!resourceId) {
+      return;
+    }
+    const cached = this.cacheManager.getResourceMasterableUnits(resourceId);
+    if (cached !== undefined) {
+      return cached === null ? undefined : cached;
+    }
+    try {
+      const resource = await this.onerosterNamespace.resources.get(resourceId);
+      const playcademyMetadata = resource.metadata?.playcademy;
+      if (!playcademyMetadata) {
+        return;
+      }
+      const masterableUnits = isPlaycademyResourceMetadata(playcademyMetadata) ? playcademyMetadata.mastery?.masterableUnits : undefined;
+      this.cacheManager.setResourceMasterableUnits(resourceId, masterableUnits ?? null);
+      return masterableUnits;
+    } catch (error2) {
+      log32.error("[MasteryTracker] Failed to fetch resource metadata for mastery config", {
+        resourceId,
+        error: error2
+      });
+      this.cacheManager.setResourceMasterableUnits(resourceId, null);
+      return;
+    }
+  }
+  async fetchEnrollmentAnalyticsFacts(studentId, courseId) {
+    try {
+      const enrollments = await this.edubridgeNamespace.enrollments.listByUser(studentId);
+      const enrollment = enrollments.find((e2) => e2.course.id === courseId);
+      if (!enrollment) {
+        log32.warn("[MasteryTracker] Enrollment not found for student/course", {
+          studentId,
+          courseId
+        });
+        return;
+      }
+      const analytics = await this.edubridgeNamespace.analytics.getEnrollmentFacts(enrollment.id);
+      return analytics.facts;
+    } catch (error2) {
+      log32.error("[MasteryTracker] Failed to load enrollment analytics facts", {
+        studentId,
+        courseId,
+        error: error2
+      });
+      return;
+    }
+  }
+  sumAnalyticsMetric(facts, metric) {
+    if (!facts) {
+      return 0;
+    }
+    let total = 0;
+    Object.values(facts).forEach((dateFacts) => {
+      Object.values(dateFacts).forEach((subjectFacts) => {
+        const metrics = subjectFacts.activityMetrics;
+        if (metrics && typeof metrics[metric] === "number") {
+          total += metrics[metric];
+        }
+      });
+    });
+    return total;
+  }
+}
+function kebabToTitleCase(kebabStr) {
+  return kebabStr.split("-").map((word) => word.charAt(0).toUpperCase() + word.slice(1)).join(" ");
+}
+init_constants();
 function validateProgressData(progressData) {
   if (!progressData.subject) {
     throw new ConfigurationError("subject", "Subject is required for Caliper events. Provide it in progressData.subject");
@@ -190963,13 +191122,13 @@ class ProgressRecorder {
   cacheManager;
   onerosterNamespace;
   caliperNamespace;
-  edubridgeNamespace;
-  constructor(studentResolver, cacheManager, onerosterNamespace, caliperNamespace, edubridgeNamespace) {
+  masteryTracker;
+  constructor(studentResolver, cacheManager, onerosterNamespace, caliperNamespace, masteryTracker) {
     this.studentResolver = studentResolver;
     this.cacheManager = cacheManager;
     this.onerosterNamespace = onerosterNamespace;
     this.caliperNamespace = caliperNamespace;
-    this.edubridgeNamespace = edubridgeNamespace;
+    this.masteryTracker = masteryTracker;
   }
   async record(courseId, studentIdentifier, progressData) {
     validateProgressData(progressData);
@@ -190978,22 +191137,22 @@ class ProgressRecorder {
     const { score, totalQuestions, correctQuestions, xpEarned, masteredUnits, attemptNumber } = progressData;
     const actualLineItemId = await this.resolveAssessmentLineItem(activityId, activityName, progressData.classId, ids);
     const currentAttemptNumber = await this.resolveAttemptNumber(attemptNumber, score, studentId, actualLineItemId);
-    const isFirstAttempt = currentAttemptNumber === 1;
-    const calculatedXp = this.calculateXpForProgress(progressData, totalQuestions, correctQuestions, xpEarned, isFirstAttempt);
+    const isFirstActiveAttempt = currentAttemptNumber === 1;
+    const calculatedXp = this.calculateXpForProgress(progressData, totalQuestions, correctQuestions, xpEarned, isFirstActiveAttempt);
     let extensions = progressData.extensions;
-    const completionProgress = await this.buildCompletionProgress({
+    const masteryProgress = await this.masteryTracker.checkProgress({
       studentId,
       courseId,
-      progressData,
-      resourceId: ids.resource
+      resourceId: ids.resource,
+      masteredUnits: progressData.masteredUnits ?? 0
     });
     let pctCompleteApp;
     let masteryAchieved = false;
-    let scoreStatus = SCORE_STATUS.partiallyGraded;
+    let scoreStatus = SCORE_STATUS.fullyGraded;
     const inProgress = "false";
-    if (completionProgress) {
-      masteryAchieved = completionProgress.masteryAchieved;
-      pctCompleteApp = completionProgress.pctCompleteApp;
+    if (masteryProgress) {
+      masteryAchieved = masteryProgress.masteryAchieved;
+      pctCompleteApp = masteryProgress.pctCompleteApp;
       extensions = {
         ...extensions || {},
         ...pctCompleteApp !== undefined ? { pctCompleteApp } : {}
@@ -191011,6 +191170,9 @@ class ProgressRecorder {
         attemptNumber: currentAttemptNumber
       });
     }
+    if (masteryAchieved) {
+      await this.masteryTracker.createCompletionEntry(studentId, courseId, progressData.classId, progressData.appName);
+    }
     await this.emitCaliperEvent(studentId, studentEmail, activityId, activityName, ids.course, courseName, totalQuestions, correctQuestions, calculatedXp, masteredUnits, currentAttemptNumber, progressData, extensions);
     return {
       xpAwarded: calculatedXp,
@@ -191039,8 +191201,9 @@ class ProgressRecorder {
     return actualLineItemId;
   }
   async resolveAttemptNumber(providedAttemptNumber, score, studentId, lineItemId) {
-    if (providedAttemptNumber)
+    if (providedAttemptNumber) {
       return providedAttemptNumber;
+    }
     if (score !== undefined) {
       return this.determineAttemptNumber(studentId, lineItemId);
     }
@@ -191064,106 +191227,13 @@ class ProgressRecorder {
     }
     return 0;
   }
-  async buildCompletionProgress({
-    studentId,
-    courseId,
-    progressData,
-    resourceId
-  }) {
-    if (typeof progressData.masteredUnits !== "number" || progressData.masteredUnits <= 0) {
-      return;
-    }
-    const masterableUnits = await this.resolveMasterableUnits(resourceId);
-    if (!masterableUnits || masterableUnits <= 0) {
-      log32.warn("[ProgressRecorder] No masterableUnits configured for course", {
-        courseId,
-        resourceId
-      });
-      return;
-    }
-    const facts = await this.fetchEnrollmentAnalyticsFacts(studentId, courseId);
-    if (!facts) {
-      log32.warn("[ProgressRecorder] Unable to retrieve analytics for mastery-based completion", { studentId, courseId });
-      return;
-    }
-    const historicalMasteredUnits = this.sumAnalyticsMetric(facts, "masteredUnits");
-    const totalMastered = historicalMasteredUnits + progressData.masteredUnits;
-    const rawPct = totalMastered / masterableUnits * 100;
-    const pctCompleteApp = Math.min(100, Math.max(0, Math.round(rawPct)));
-    const masteryAchieved = totalMastered >= masterableUnits;
-    return { pctCompleteApp, masteryAchieved };
-  }
-  async fetchEnrollmentAnalyticsFacts(studentId, courseId) {
-    try {
-      const enrollments = await this.edubridgeNamespace.enrollments.listByUser(studentId);
-      const enrollment = enrollments.find((e2) => e2.course.id === courseId);
-      if (!enrollment) {
-        log32.warn("[ProgressRecorder] Enrollment not found for student/course", {
-          studentId,
-          courseId
-        });
-        return;
-      }
-      const analytics = await this.edubridgeNamespace.analytics.getEnrollmentFacts(enrollment.id);
-      return analytics.facts;
-    } catch (error2) {
-      log32.error("[ProgressRecorder] Failed to load enrollment analytics facts", {
-        studentId,
-        courseId,
-        error: error2
-      });
-      return;
-    }
-  }
-  sumAnalyticsMetric(facts, metric) {
-    if (!facts) {
-      return 0;
-    }
-    let total = 0;
-    Object.values(facts).forEach((dateFacts) => {
-      Object.values(dateFacts).forEach((subjectFacts) => {
-        const metrics = subjectFacts.activityMetrics;
-        if (metrics && typeof metrics[metric] === "number") {
-          total += metrics[metric];
-        }
-      });
-    });
-    return total;
-  }
-  async resolveMasterableUnits(resourceId) {
-    if (!resourceId) {
-      return;
-    }
-    const cached = this.cacheManager.getResourceMasterableUnits(resourceId);
-    if (cached !== undefined) {
-      return cached === null ? undefined : cached;
-    }
-    try {
-      const resource = await this.onerosterNamespace.resources.get(resourceId);
-      const playcademyMetadata = resource.metadata?.playcademy;
-      if (!playcademyMetadata) {
-        return;
-      }
-      const masterableUnits = isPlaycademyResourceMetadata(playcademyMetadata) ? playcademyMetadata.mastery?.masterableUnits : undefined;
-      this.cacheManager.setResourceMasterableUnits(resourceId, masterableUnits ?? null);
-      return masterableUnits;
-    } catch (error2) {
-      log32.error("[ProgressRecorder] Failed to fetch resource metadata for mastery config", {
-        resourceId,
-        error: error2
-      });
-      this.cacheManager.setResourceMasterableUnits(resourceId, null);
-      return;
-    }
-  }
   async getOrCreateLineItem(lineItemId, activityName, classId, ids) {
     try {
       const lineItem = await this.onerosterNamespace.assessmentLineItems.findOrCreate(lineItemId, {
         sourcedId: lineItemId,
         title: activityName,
         status: ONEROSTER_STATUS.active,
-        ...classId ? { class: { sourcedId: classId } } : { course: { sourcedId: ids.course } },
-        ...ids.componentResource ? { componentResource: { sourcedId: ids.componentResource } } : ids.component ? { component: { sourcedId: ids.component } } : {}
+        ...classId ? { class: { sourcedId: classId } } : { course: { sourcedId: ids.course } }
       });
       if (!lineItem.sourcedId) {
         throw new TimebackError(`Assessment line item created but has no sourcedId. This should not happen and indicates an upstream API issue.`);
@@ -191181,21 +191251,15 @@ class ProgressRecorder {
     }
   }
   async determineAttemptNumber(studentId, lineItemId) {
-    const latestAttempt = await this.onerosterNamespace.assessmentResults.getLatestForStudent(studentId, lineItemId);
-    if (latestAttempt) {
-      const previousAttemptNumber = latestAttempt.metadata?.attemptNumber || 0;
-      const newAttemptNumber = previousAttemptNumber + 1;
-      log32.debug("[ProgressRecorder] Found previous attempt, incrementing", {
-        previousAttemptNumber,
-        newAttemptNumber,
-        previousScore: latestAttempt.score
-      });
-      return newAttemptNumber;
+    const stats = await this.onerosterNamespace.assessmentResults.getAttemptStats(studentId, lineItemId);
+    if (stats) {
+      return stats.activeAttemptCount + 1;
     }
     return 1;
   }
   async createGradebookEntry(lineItemId, studentId, attemptNumber, score, totalQuestions, correctQuestions, xp, masteredUnits, scoreStatus, inProgress, appName) {
-    const resultId = `${lineItemId}:${studentId}:attempt-${attemptNumber}`;
+    const timestamp4 = Date.now().toString(36);
+    const resultId = `${lineItemId}:${studentId}:${timestamp4}`;
     await this.onerosterNamespace.assessmentResults.upsert(resultId, {
       sourcedId: resultId,
       status: ONEROSTER_STATUS.active,
@@ -195351,7 +195415,8 @@ class TimebackClient {
     this.edubridge = createEduBridgeNamespace(this);
     this.cacheManager = new TimebackCacheManager;
     this.studentResolver = new StudentResolver(this.cacheManager, this.oneroster);
-    this.progressRecorder = new ProgressRecorder(this.studentResolver, this.cacheManager, this.oneroster, this.caliper, this.edubridge);
+    const masteryTracker = new MasteryTracker(this.cacheManager, this.oneroster, this.edubridge);
+    this.progressRecorder = new ProgressRecorder(this.studentResolver, this.cacheManager, this.oneroster, this.caliper, masteryTracker);
     this.sessionRecorder = new SessionRecorder(this.studentResolver, this.caliper);
     if (this.credentials) {
       this._ensureAuthenticated().catch((error2) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@playcademy/vite-plugin",
-    "version": "0.1.34",
+    "version": "0.1.36",
     "type": "module",
     "exports": {
         ".": {
@@ -21,7 +21,7 @@
     "dependencies": {
         "archiver": "^7.0.1",
         "picocolors": "^1.1.1",
-        "playcademy": "0.14.21"
+        "playcademy": "0.14.23"
     },
     "devDependencies": {
         "@inquirer/prompts": "^7.8.6",