@vue-skuilder/db 0.1.11 → 0.1.12

package/dist/core/index.d.mts

@@ -1,8 +1,8 @@
-import { i as StudyContentSource, U as UserDBInterface, C as CourseDBInterface, e as ContentNavigationStrategyData, f as StudySessionReviewItem, g as ScheduledCard, S as StudySessionNewItem } from '../userDB-DJ8HMw83.mjs';
-export { G as ActivityRecord, A as AdminDBInterface, t as AssignedCard, h as AssignedContent, s as AssignedCourse, r as AssignedTag, c as ClassroomDBInterface, B as ClassroomRegistration, z as ClassroomRegistrationDesignation, E as ClassroomRegistrationDoc, p as ContentSourceID, d as CourseInfo, H as CourseRegistration, I as CourseRegistrationDoc, b as CoursesDBInterface, j as StudentClassroomDBInterface, l as StudySessionFailedItem, m as StudySessionFailedNewItem, n as StudySessionFailedReviewItem, k as StudySessionItem, T as TeacherClassroomDBInterface, F as UserConfig, x as UserCourseSetting, w as UserCourseSettings, v as UserDBAuthenticator, a as UserDBReader, u as UserDBWriter, y as UsrCrsDataInterface, q as getStudySource, o as isReview } from '../userDB-DJ8HMw83.mjs';
-export { D as DataLayerProvider } from '../dataLayerProvider-VieuAAkV.mjs';
-import { h as CardHistory, C as CardRecord, i as QuestionRecord } from '../types-legacy-B8ahaCbj.mjs';
-export { b as CardData, c as CourseListData, e as DataShapeData, d as DisplayableData, D as DocType, g as DocTypePrefixes, F as Field, G as GuestUsername, Q as QualifiedCardID, f as QuestionData, S as SkuilderCourseData, a as Tag, T as TagStub, l as log } from '../types-legacy-B8ahaCbj.mjs';
+import { i as StudyContentSource, U as UserDBInterface, C as CourseDBInterface, e as ContentNavigationStrategyData, f as StudySessionReviewItem, g as ScheduledCard, S as StudySessionNewItem } from '../userDB-C4yyAnpp.mjs';
+export { H as ActivityRecord, A as AdminDBInterface, u as AssignedCard, h as AssignedContent, t as AssignedCourse, s as AssignedTag, c as ClassroomDBInterface, E as ClassroomRegistration, B as ClassroomRegistrationDesignation, F as ClassroomRegistrationDoc, p as ContentSourceID, d as CourseInfo, I as CourseRegistration, r as CourseRegistrationDoc, b as CoursesDBInterface, j as StudentClassroomDBInterface, l as StudySessionFailedItem, m as StudySessionFailedNewItem, n as StudySessionFailedReviewItem, k as StudySessionItem, T as TeacherClassroomDBInterface, G as UserConfig, y as UserCourseSetting, x as UserCourseSettings, w as UserDBAuthenticator, a as UserDBReader, v as UserDBWriter, z as UsrCrsDataInterface, q as getStudySource, o as isReview } from '../userDB-C4yyAnpp.mjs';
+export { D as DataLayerProvider } from '../dataLayerProvider-BiP3kWix.mjs';
+import { C as CardHistory, c as CardRecord, i as QuestionRecord } from '../types-legacy-6ettoclI.mjs';
+export { d as CardData, e as CourseListData, g as DataShapeData, f as DisplayableData, D as DocType, b as DocTypePrefixes, F as Field, G as GuestUsername, Q as QualifiedCardID, h as QuestionData, S as SkuilderCourseData, a as Tag, T as TagStub, l as log } from '../types-legacy-6ettoclI.mjs';
 import { DataShape, ParsedCard } from '@vue-skuilder/common';
 import 'moment';
 
@@ -26,7 +26,8 @@ interface PouchDBError extends Error {
 declare function docIsDeleted(e: PouchDBError): boolean;
 
 declare enum Navigators {
-    ELO = "elo"
+    ELO = "elo",
+    HARDCODED = "hardcodedOrder"
 }
 /**
  * A content-navigator provides runtime steering of study sessions.

package/dist/core/index.d.ts

@@ -1,8 +1,8 @@
-import { i as StudyContentSource, U as UserDBInterface, C as CourseDBInterface, e as ContentNavigationStrategyData, f as StudySessionReviewItem, g as ScheduledCard, S as StudySessionNewItem } from '../userDB-B7zTQ123.js';
-export { G as ActivityRecord, A as AdminDBInterface, t as AssignedCard, h as AssignedContent, s as AssignedCourse, r as AssignedTag, c as ClassroomDBInterface, B as ClassroomRegistration, z as ClassroomRegistrationDesignation, E as ClassroomRegistrationDoc, p as ContentSourceID, d as CourseInfo, H as CourseRegistration, I as CourseRegistrationDoc, b as CoursesDBInterface, j as StudentClassroomDBInterface, l as StudySessionFailedItem, m as StudySessionFailedNewItem, n as StudySessionFailedReviewItem, k as StudySessionItem, T as TeacherClassroomDBInterface, F as UserConfig, x as UserCourseSetting, w as UserCourseSettings, v as UserDBAuthenticator, a as UserDBReader, u as UserDBWriter, y as UsrCrsDataInterface, q as getStudySource, o as isReview } from '../userDB-B7zTQ123.js';
-export { D as DataLayerProvider } from '../dataLayerProvider-juuqUHOP.js';
-import { h as CardHistory, C as CardRecord, i as QuestionRecord } from '../types-legacy-B8ahaCbj.js';
-export { b as CardData, c as CourseListData, e as DataShapeData, d as DisplayableData, D as DocType, g as DocTypePrefixes, F as Field, G as GuestUsername, Q as QualifiedCardID, f as QuestionData, S as SkuilderCourseData, a as Tag, T as TagStub, l as log } from '../types-legacy-B8ahaCbj.js';
+import { i as StudyContentSource, U as UserDBInterface, C as CourseDBInterface, e as ContentNavigationStrategyData, f as StudySessionReviewItem, g as ScheduledCard, S as StudySessionNewItem } from '../userDB-CD6s6ZCp.js';
+export { H as ActivityRecord, A as AdminDBInterface, u as AssignedCard, h as AssignedContent, t as AssignedCourse, s as AssignedTag, c as ClassroomDBInterface, E as ClassroomRegistration, B as ClassroomRegistrationDesignation, F as ClassroomRegistrationDoc, p as ContentSourceID, d as CourseInfo, I as CourseRegistration, r as CourseRegistrationDoc, b as CoursesDBInterface, j as StudentClassroomDBInterface, l as StudySessionFailedItem, m as StudySessionFailedNewItem, n as StudySessionFailedReviewItem, k as StudySessionItem, T as TeacherClassroomDBInterface, G as UserConfig, y as UserCourseSetting, x as UserCourseSettings, w as UserDBAuthenticator, a as UserDBReader, v as UserDBWriter, z as UsrCrsDataInterface, q as getStudySource, o as isReview } from '../userDB-CD6s6ZCp.js';
+export { D as DataLayerProvider } from '../dataLayerProvider-DSdeyRT3.js';
+import { C as CardHistory, c as CardRecord, i as QuestionRecord } from '../types-legacy-6ettoclI.js';
+export { d as CardData, e as CourseListData, g as DataShapeData, f as DisplayableData, D as DocType, b as DocTypePrefixes, F as Field, G as GuestUsername, Q as QualifiedCardID, h as QuestionData, S as SkuilderCourseData, a as Tag, T as TagStub, l as log } from '../types-legacy-6ettoclI.js';
 import { DataShape, ParsedCard } from '@vue-skuilder/common';
 import 'moment';
 
@@ -26,7 +26,8 @@ interface PouchDBError extends Error {
 declare function docIsDeleted(e: PouchDBError): boolean;
 
 declare enum Navigators {
-    ELO = "elo"
+    ELO = "elo",
+    HARDCODED = "hardcodedOrder"
 }
 /**
  * A content-navigator provides runtime steering of study sessions.

package/dist/core/index.js

@@ -343,7 +343,9 @@ var init_updateQueue = __esm({
       async applyUpdates(id) {
         logger.debug(`Applying updates on doc: ${id}`);
         if (this.inprogressUpdates[id]) {
-          await this.readDB.info();
+          while (this.inprogressUpdates[id]) {
+            await new Promise((resolve) => setTimeout(resolve, Math.random() * 50));
+          }
           return this.applyUpdates(id);
         } else {
           if (this.pendingUpdates[id] && this.pendingUpdates[id].length > 0) {
@@ -379,6 +381,9 @@ var init_updateQueue = __esm({
                 if (e.name === "conflict" && i < MAX_RETRIES - 1) {
                   logger.warn(`Conflict on update for doc ${id}, retry #${i + 1}`);
                   await new Promise((res) => setTimeout(res, 50 * Math.random()));
+                } else if (e.name === "not_found" && i === 0) {
+                  logger.warn(`Update failed for ${id} - does not exist. Throwing to caller.`);
+                  throw e;
                 } else {
                   delete this.inprogressUpdates[id];
                   if (this.pendingUpdates[id]) {
@@ -744,12 +749,74 @@ var init_elo = __esm({
   }
 });
 
+// src/core/navigators/hardcodedOrder.ts
+var hardcodedOrder_exports = {};
+__export(hardcodedOrder_exports, {
+  default: () => HardcodedOrderNavigator
+});
+var HardcodedOrderNavigator;
+var init_hardcodedOrder = __esm({
+  "src/core/navigators/hardcodedOrder.ts"() {
+    "use strict";
+    init_navigators();
+    init_logger();
+    HardcodedOrderNavigator = class extends ContentNavigator {
+      orderedCardIds = [];
+      user;
+      course;
+      constructor(user, course, strategyData) {
+        super();
+        this.user = user;
+        this.course = course;
+        if (strategyData.serializedData) {
+          try {
+            this.orderedCardIds = JSON.parse(strategyData.serializedData);
+          } catch (e) {
+            logger.error("Failed to parse serializedData for HardcodedOrderNavigator", e);
+          }
+        }
+      }
+      async getPendingReviews() {
+        const reviews = await this.user.getPendingReviews(this.course.getCourseID());
+        return reviews.map((r) => {
+          return {
+            ...r,
+            contentSourceType: "course",
+            contentSourceID: this.course.getCourseID(),
+            cardID: r.cardId,
+            courseID: r.courseId,
+            reviewID: r._id,
+            status: "review"
+          };
+        });
+      }
+      async getNewCards(limit = 99) {
+        const activeCardIds = (await this.user.getActiveCards()).map((c) => c.cardID);
+        const newCardIds = this.orderedCardIds.filter(
+          (cardId) => !activeCardIds.includes(cardId)
+        );
+        const cardsToReturn = newCardIds.slice(0, limit);
+        return cardsToReturn.map((cardId) => {
+          return {
+            cardID: cardId,
+            courseID: this.course.getCourseID(),
+            contentSourceType: "course",
+            contentSourceID: this.course.getCourseID(),
+            status: "new"
+          };
+        });
+      }
+    };
+  }
+});
+
 // import("./**/*") in src/core/navigators/index.ts
 var globImport;
 var init_ = __esm({
   'import("./**/*") in src/core/navigators/index.ts'() {
     globImport = __glob({
       "./elo.ts": () => Promise.resolve().then(() => (init_elo(), elo_exports)),
+      "./hardcodedOrder.ts": () => Promise.resolve().then(() => (init_hardcodedOrder(), hardcodedOrder_exports)),
       "./index.ts": () => Promise.resolve().then(() => (init_navigators(), navigators_exports))
     });
   }
@@ -769,6 +836,7 @@ var init_navigators = __esm({
     init_();
     Navigators = /* @__PURE__ */ ((Navigators2) => {
       Navigators2["ELO"] = "elo";
+      Navigators2["HARDCODED"] = "hardcodedOrder";
       return Navigators2;
     })(Navigators || {});
     ContentNavigator = class {
@@ -993,6 +1061,23 @@ var init_courseDB = __esm({
         if (!doc.docType || !(doc.docType === "CARD" /* CARD */)) {
           throw new Error(`failed to remove ${id} from course ${this.id}. id does not point to a card`);
         }
+        try {
+          const appliedTags = await this.getAppliedTags(id);
+          const results = await Promise.allSettled(
+            appliedTags.rows.map(async (tagRow) => {
+              const tagId = tagRow.id;
+              await this.removeTagFromCard(id, tagId);
+            })
+          );
+          results.forEach((result, index) => {
+            if (result.status === "rejected") {
+              const tagId = appliedTags.rows[index].id;
+              logger.error(`Failed to remove card ${id} from tag ${tagId}: ${result.reason}`);
+            }
+          });
+        } catch (error) {
+          logger.error(`Error removing card ${id} from tags: ${error}`);
+        }
         return this.db.remove(doc);
       }
       async getCardDisplayableDataIDs(id) {
@@ -1176,23 +1261,9 @@ ${above.rows.map((r) => `	${r.id}-${r.key}
       ////////////////////////////////////
       getNavigationStrategy(id) {
         logger.debug(`[courseDB] Getting navigation strategy: ${id}`);
-        const strategy = {
-          id: "ELO",
-          docType: "NAVIGATION_STRATEGY" /* NAVIGATION_STRATEGY */,
-          name: "ELO",
-          description: "ELO-based navigation strategy for ordering content by difficulty",
-          implementingClass: "elo" /* ELO */,
-          course: this.id,
-          serializedData: ""
-          // serde is a noop for ELO navigator.
-        };
-        return Promise.resolve(strategy);
-      }
-      getAllNavigationStrategies() {
-        logger.debug("[courseDB] Returning hard-coded navigation strategies");
-        const strategies = [
-          {
-            id: "ELO",
+        if (id == "") {
+          const strategy = {
+            _id: "NAVIGATION_STRATEGY-ELO",
             docType: "NAVIGATION_STRATEGY" /* NAVIGATION_STRATEGY */,
             name: "ELO",
             description: "ELO-based navigation strategy for ordering content by difficulty",
@@ -1200,14 +1271,25 @@ ${above.rows.map((r) => `	${r.id}-${r.key}
             course: this.id,
             serializedData: ""
             // serde is a noop for ELO navigator.
-          }
-        ];
-        return Promise.resolve(strategies);
+          };
+          return Promise.resolve(strategy);
+        } else {
+          return this.db.get(id);
+        }
       }
-      addNavigationStrategy(data) {
-        logger.debug(`[courseDB] Adding navigation strategy: ${data.id}`);
-        logger.debug(JSON.stringify(data));
-        return Promise.resolve();
+      async getAllNavigationStrategies() {
+        const prefix = DocTypePrefixes["NAVIGATION_STRATEGY" /* NAVIGATION_STRATEGY */];
+        const result = await this.db.allDocs({
+          startkey: prefix,
+          endkey: `${prefix}\uFFF0`,
+          include_docs: true
+        });
+        return result.rows.map((row) => row.doc);
+      }
+      async addNavigationStrategy(data) {
+        logger.debug(`[courseDB] Adding navigation strategy: ${data._id}`);
+        return this.db.put(data).then(() => {
+        });
       }
       updateNavigationStrategy(id, data) {
         logger.debug(`[courseDB] Updating navigation strategy: ${id}`);
@@ -1215,9 +1297,32 @@ ${above.rows.map((r) => `	${r.id}-${r.key}
         return Promise.resolve();
       }
       async surfaceNavigationStrategy() {
+        try {
+          const config = await this.getCourseConfig();
+          if (config.defaultNavigationStrategyId) {
+            try {
+              const strategy = await this.getNavigationStrategy(config.defaultNavigationStrategyId);
+              if (strategy) {
+                logger.debug(`Surfacing strategy ${strategy.name} from course config`);
+                return strategy;
+              }
+            } catch (e) {
+              logger.warn(
+                // @ts-expect-error tmp: defaultNavigationStrategyId property does not yet exist
+                `Failed to load strategy '${config.defaultNavigationStrategyId}' specified in course config. Falling back to ELO.`,
+                e
+              );
+            }
+          }
+        } catch (e) {
+          logger.warn(
+            "Could not retrieve course config to determine navigation strategy. Falling back to ELO.",
+            e
+          );
+        }
         logger.warn(`Returning hard-coded default ELO navigator`);
         const ret = {
-          id: "ELO",
+          _id: "NAVIGATION_STRATEGY-ELO",
           docType: "NAVIGATION_STRATEGY" /* NAVIGATION_STRATEGY */,
           name: "ELO",
           description: "ELO-based navigation strategy",
@@ -2339,17 +2444,21 @@ Currently logged-in as ${this._username}.`
         } catch (e) {
           const reason = e;
           if (reason.status === 404) {
-            const initCardHistory = {
-              _id: cardHistoryID,
-              cardID: record.cardID,
-              courseID: record.courseID,
-              records: [record],
-              lapses: 0,
-              streak: 0,
-              bestInterval: 0
-            };
-            const putResult = await this.writeDB.put(initCardHistory);
-            return { ...initCardHistory, _rev: putResult.rev };
+            try {
+              const initCardHistory = {
+                _id: cardHistoryID,
+                cardID: record.cardID,
+                courseID: record.courseID,
+                records: [record],
+                lapses: 0,
+                streak: 0,
+                bestInterval: 0
+              };
+              const putResult = await this.writeDB.put(initCardHistory);
+              return { ...initCardHistory, _rev: putResult.rev };
+            } catch (creationError) {
+              throw new Error(`Failed to create CardHistory for ${cardHistoryID}. Reason: ${creationError}`);
+            }
           } else {
             throw new Error(`putCardRecord failed because of:
   name:${reason.name}