@speakableio/core 0.1.30 → 0.1.32

package/dist/index.web.d.mts

@@ -65,6 +65,9 @@ interface Assignment {
     isAssessment: boolean;
     isAvailable: boolean;
     ltiDeeplink?: string;
+    content?: string[];
+    weights?: Record<string, number>;
+    language?: string;
 }
 interface AssignmentWithId extends Assignment {
     id: string;
@@ -214,6 +217,9 @@ declare const createAssignmentRepo: () => {
         courseId: string;
         isAssessment: boolean;
         ltiDeeplink?: string;
+        content?: string[];
+        weights?: Record<string, number>;
+        language?: string;
     } | null>;
     attachScoresAssignment: (args_0: {
         assignments: AssignmentWithId[];
@@ -258,6 +264,9 @@ declare const createAssignmentRepo: () => {
         courseId: string;
         isAssessment: boolean;
         ltiDeeplink?: string;
+        content?: string[];
+        weights?: Record<string, number>;
+        language?: string;
     }[]>;
     getAssignmentScores: (args_0: {
         assignmentId: string;
@@ -319,6 +328,9 @@ declare function useAssignment({ assignmentId, enabled, analyticType, userId, }:
     courseId: string;
     isAssessment: boolean;
     ltiDeeplink?: string;
+    content?: string[];
+    weights?: Record<string, number>;
+    language?: string;
 } | null, Error>;
 
 declare const enum FeedbackTypesCard {
@@ -800,6 +812,9 @@ declare function createFsClientBase({ db, helpers, httpsCallable, logEvent, }: {
             courseId: string;
             isAssessment: boolean;
             ltiDeeplink?: string;
+            content?: string[];
+            weights?: Record<string, number>;
+            language?: string;
         } | null>;
         attachScoresAssignment: (args_0: {
             assignments: AssignmentWithId[];
@@ -844,6 +859,9 @@ declare function createFsClientBase({ db, helpers, httpsCallable, logEvent, }: {
             courseId: string;
             isAssessment: boolean;
             ltiDeeplink?: string;
+            content?: string[];
+            weights?: Record<string, number>;
+            language?: string;
         }[]>;
         getAssignmentScores: (args_0: {
             assignmentId: string;
@@ -1058,6 +1076,9 @@ declare function useActivity({ id, isAssignment, onAssignmentSubmitted, ltiData,
             courseId: string;
             isAssessment: boolean;
             ltiDeeplink?: string;
+            content?: string[];
+            weights?: Record<string, number>;
+            language?: string;
         } | null | undefined;
         query: _tanstack_react_query.UseQueryResult<AssignmentWithId | {
             scores: any;
@@ -1097,6 +1118,9 @@ declare function useActivity({ id, isAssignment, onAssignmentSubmitted, ltiData,
             courseId: string;
             isAssessment: boolean;
             ltiDeeplink?: string;
+            content?: string[];
+            weights?: Record<string, number>;
+            language?: string;
         } | null, Error>;
     };
     scores: {
@@ -1175,6 +1199,9 @@ declare const createFsClientWeb: ({ db, httpsCallable, logEvent }: FsClientParam
             courseId: string;
             isAssessment: boolean;
             ltiDeeplink?: string;
+            content?: string[];
+            weights?: Record<string, number>;
+            language?: string;
         } | null>;
         attachScoresAssignment: (args_0: {
             assignments: AssignmentWithId[];
@@ -1219,6 +1246,9 @@ declare const createFsClientWeb: ({ db, httpsCallable, logEvent }: FsClientParam
             courseId: string;
             isAssessment: boolean;
             ltiDeeplink?: string;
+            content?: string[];
+            weights?: Record<string, number>;
+            language?: string;
         }[]>;
         getAssignmentScores: (args_0: {
             assignmentId: string;

package/dist/index.web.js

@@ -121,8 +121,8 @@ var FirebaseAPI = class _FirebaseAPI {
     const docRef = doc2(this.db, path);
     const docSnap = await getDoc2(docRef);
     const data = docSnap.exists() ? {
-      id: docSnap.id,
-      ...docSnap.data()
+      ...docSnap.data(),
+      id: docSnap.id
     } : null;
     return {
       id: docSnap.id,
@@ -148,8 +148,8 @@ var FirebaseAPI = class _FirebaseAPI {
     const collectionRef = collection2(this.db, path);
     const docRef = await addDoc2(collectionRef, data);
     return {
-      id: docRef.id,
-      ...data
+      ...data,
+      id: docRef.id
     };
   }
   async setDoc(path, data, options = {}) {
@@ -1528,7 +1528,7 @@ import dayjs4 from "dayjs";
 async function _submitAssignmentScore({
   cardIds,
   assignment,
-  setWeights,
+  weights,
   userId,
   status,
   studentName
@@ -1546,7 +1546,7 @@ async function _submitAssignmentScore({
       assignment,
       userId,
       cardIds,
-      setWeights,
+      weights,
       fieldsUpdated,
       studentName
     );
@@ -1561,14 +1561,14 @@ var submitAssignmentScore = withErrorHandler(
   _submitAssignmentScore,
   "submitAssignmentScore"
 );
-async function handleAssessment(assignment, userId, cardIds, setWeights, fieldsUpdated, studentName) {
+async function handleAssessment(assignment, userId, cardIds, weights, fieldsUpdated, studentName) {
   var _a, _b;
   const path = refsAssignmentFiresotre.assignmentScores({ id: assignment.id, userId });
   const response = await api.getDoc(path);
   if (!response.data) {
     throw new Error("Score not found");
   }
-  const { score: scoreCalculated } = calculateScoreAndProgress_default(response.data, cardIds, setWeights);
+  const { score: scoreCalculated } = calculateScoreAndProgress_default(response.data, cardIds, weights);
   await api.updateDoc(path, { score: scoreCalculated, status: "PENDING_REVIEW" });
   await ((_b = (_a = SpeakableFirebaseFunctions).submitAssessment) == null ? void 0 : _b.call(_a, {
     assignmentId: assignment.id,
@@ -1664,7 +1664,8 @@ function useUpdateCardScore({
   isAssignment,
   activityId,
   userId,
-  set
+  cardIds,
+  weights
 }) {
   const { queryClient } = useSpeakableApi();
   const queryKey = scoreQueryKeys.byId(activityId);
@@ -1674,8 +1675,9 @@ function useUpdateCardScore({
       const { progress, score, newScoreUpdated, updatedCardScore } = getScoreUpdated({
         previousScores: previousScores != null ? previousScores : {},
         cardId,
-        set,
-        cardScore
+        cardScore,
+        cardIds,
+        weights
       });
       await updateCardScore({
         userId,
@@ -1696,7 +1698,8 @@ function useUpdateCardScore({
           score: previousScore,
           cardId,
           cardScore,
-          set
+          cardIds,
+          weights
         });
         return {
           ...previousScore,
@@ -1721,9 +1724,10 @@ var getScoreUpdated = ({
   cardId,
   cardScore,
   previousScores,
-  set
+  cardIds,
+  weights
 }) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const previousCard = (_a = previousScores.cards) == null ? void 0 : _a[cardId];
   const newCardScore = {
     ...previousCard != null ? previousCard : {},
@@ -1736,11 +1740,7 @@ var getScoreUpdated = ({
       [cardId]: newCardScore
     }
   };
-  const { score, progress } = calculateScoreAndProgress_default(
-    newScores,
-    (_c = set == null ? void 0 : set.content) != null ? _c : [],
-    (_d = set == null ? void 0 : set.weights) != null ? _d : {}
-  );
+  const { score, progress } = calculateScoreAndProgress_default(newScores, cardIds, weights);
   return {
     newScoreUpdated: newScores,
     updatedCardScore: cardScore,
@@ -1752,9 +1752,10 @@ var handleOptimisticScore = ({
   score,
   cardId,
   cardScore,
-  set
+  cardIds,
+  weights
 }) => {
-  var _a, _b, _c;
+  var _a;
   let cards = { ...(_a = score == null ? void 0 : score.cards) != null ? _a : {} };
   cards = {
     ...cards,
@@ -1769,8 +1770,8 @@ var handleOptimisticScore = ({
       ...score != null ? score : {},
       cards
     },
-    (_b = set == null ? void 0 : set.content) != null ? _b : [],
-    (_c = set == null ? void 0 : set.weights) != null ? _c : {}
+    cardIds,
+    weights
   );
   return { cards, score: scoreValue, progress };
 };
@@ -1802,7 +1803,7 @@ function useSubmitAssignmentScore({
       assignment,
       userId,
       cardIds,
-      setWeights,
+      weights,
       scores,
       status
     }) => {
@@ -1811,7 +1812,7 @@ function useSubmitAssignmentScore({
           assignment,
           userId,
           cardIds,
-          setWeights,
+          weights,
           status,
           studentName
         });
@@ -1930,7 +1931,7 @@ function useActivity({
   onAssignmentSubmitted,
   ltiData
 }) {
-  var _a, _b, _c, _d;
+  var _a, _b;
   const { queryClient, user } = useSpeakableApi();
   const userId = user.auth.uid;
   const assignmentQuery = useAssignment({
@@ -1942,9 +1943,15 @@ function useActivity({
   const setId = isAssignment ? (_a = activeAssignment == null ? void 0 : activeAssignment.setId) != null ? _a : "" : id;
   const querySet = useSet({ setId });
   const setData = querySet.data;
+  const assignmentContent = activeAssignment == null ? void 0 : activeAssignment.content;
+  const assignmentWeights = activeAssignment == null ? void 0 : activeAssignment.weights;
+  const setContent = setData == null ? void 0 : setData.content;
+  const setWeights = setData == null ? void 0 : setData.weights;
+  const contentCardsToUse = isAssignment ? assignmentContent != null ? assignmentContent : setContent : setContent;
+  const weightsToUse = isAssignment ? assignmentWeights != null ? assignmentWeights : setWeights : setWeights;
   const activityId = isAssignment ? (_b = activeAssignment == null ? void 0 : activeAssignment.id) != null ? _b : "" : setId;
   const { cardsObject, cardsQueries, cards } = useCards({
-    cardIds: (_c = setData == null ? void 0 : setData.content) != null ? _c : [],
+    cardIds: contentCardsToUse != null ? contentCardsToUse : [],
     enabled: querySet.isSuccess,
     asObject: true
   });
@@ -1961,7 +1968,8 @@ function useActivity({
     activityId,
     isAssignment,
     userId,
-    set: (_d = querySet.data) != null ? _d : void 0
+    cardIds: contentCardsToUse != null ? contentCardsToUse : [],
+    weights: weightsToUse != null ? weightsToUse : {}
   });
   const { mutationClearScore } = useClearScore();
   const { submitAssignmentScore: submitAssignmentScore2 } = useSubmitAssignmentScore({
@@ -2001,7 +2009,7 @@ function useActivity({
     });
   };
   const onSubmitScore = async () => {
-    var _a2, _b2, _c2, _d2, _e, _f, _g, _h, _i, _j, _k, _l;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j;
     try {
       let results;
       if (isAssignment) {
@@ -2012,23 +2020,23 @@ function useActivity({
         results = await submitAssignmentScore2({
           assignment: assignmentQuery.data,
           userId,
-          cardIds: (_b2 = setData == null ? void 0 : setData.content) != null ? _b2 : [],
+          cardIds: contentCardsToUse != null ? contentCardsToUse : [],
           scores: scoreQuery.data,
-          setWeights: (_c2 = setData == null ? void 0 : setData.weights) != null ? _c2 : {},
+          weights: weightsToUse != null ? weightsToUse : {},
           status: hasPendingReview ? "PENDING_REVIEW" : "FINALIZED"
         });
-        if ((_d2 = assignmentQuery.data) == null ? void 0 : _d2.ltiDeeplink) {
+        if ((_b2 = assignmentQuery.data) == null ? void 0 : _b2.ltiDeeplink) {
           submitLTIScore({
-            maxPoints: (_e = assignmentQuery.data) == null ? void 0 : _e.maxPoints,
-            score: (_g = (_f = scoreQuery.data) == null ? void 0 : _f.score) != null ? _g : 0,
-            SERVICE_KEY: (_h = ltiData == null ? void 0 : ltiData.serviceKey) != null ? _h : "",
-            lineItemId: (_i = ltiData == null ? void 0 : ltiData.lineItemId) != null ? _i : "",
-            lti_id: (_j = ltiData == null ? void 0 : ltiData.lti_id) != null ? _j : ""
+            maxPoints: (_c = assignmentQuery.data) == null ? void 0 : _c.maxPoints,
+            score: (_e = (_d = scoreQuery.data) == null ? void 0 : _d.score) != null ? _e : 0,
+            SERVICE_KEY: (_f = ltiData == null ? void 0 : ltiData.serviceKey) != null ? _f : "",
+            lineItemId: (_g = ltiData == null ? void 0 : ltiData.lineItemId) != null ? _g : "",
+            lti_id: (_h = ltiData == null ? void 0 : ltiData.lti_id) != null ? _h : ""
           });
         }
       } else {
         results = await submitPracticeScore2({
-          setId: (_l = (_k = querySet.data) == null ? void 0 : _k.id) != null ? _l : "",
+          setId: (_j = (_i = querySet.data) == null ? void 0 : _i.id) != null ? _j : "",
           userId,
           scores: scoreQuery.data
         });
@@ -2046,7 +2054,7 @@ function useActivity({
     gradingStandard,
     type
   }) => {
-    var _a2, _b2, _c2, _d2, _e, _f, _g, _h;
+    var _a2, _b2, _c, _d, _e, _f, _g, _h;
     const card = cardsObject == null ? void 0 : cardsObject[cardId];
     const scoresObject = queryClient.getQueryData(scoreQueryKeys.byId(activityId));
     const cardScore = (_a2 = scoresObject == null ? void 0 : scoresObject.cards) == null ? void 0 : _a2[cardId];
@@ -2054,8 +2062,8 @@ function useActivity({
     addGradingStandardLog(
       {
         assignmentId: (_b2 = activeAssignment == null ? void 0 : activeAssignment.id) != null ? _b2 : "",
-        courseId: (_c2 = activeAssignment == null ? void 0 : activeAssignment.courseId) != null ? _c2 : "",
-        teacherId: (_d2 = activeAssignment == null ? void 0 : activeAssignment.owners[0]) != null ? _d2 : "",
+        courseId: (_c = activeAssignment == null ? void 0 : activeAssignment.courseId) != null ? _c : "",
+        teacherId: (_d = activeAssignment == null ? void 0 : activeAssignment.owners[0]) != null ? _d : "",
         setId: (_e = setData == null ? void 0 : setData.id) != null ? _e : "",
         cardId,
         level: gradingStandard.level,