@vue-skuilder/db 0.1.11 → 0.1.12

package/dist/impl/static/index.d.mts

@@ -1,21 +1,29 @@
-import { U as UserDBInterface, C as CourseDBInterface, b as CoursesDBInterface, c as ClassroomDBInterface, A as AdminDBInterface, a as UserDBReader, d as CourseInfo, S as StudySessionNewItem, D as DataLayerResult, e as ContentNavigationStrategyData, f as StudySessionReviewItem, g as ScheduledCard } from '../../userDB-DJ8HMw83.mjs';
-import { D as DataLayerProvider } from '../../dataLayerProvider-VieuAAkV.mjs';
-import { S as StaticCourseManifest } from '../../types-Che4wTwA.mjs';
+import { U as UserDBInterface, C as CourseDBInterface, b as CoursesDBInterface, c as ClassroomDBInterface, A as AdminDBInterface, a as UserDBReader, d as CourseInfo, S as StudySessionNewItem, D as DataLayerResult, e as ContentNavigationStrategyData, f as StudySessionReviewItem, g as ScheduledCard } from '../../userDB-C4yyAnpp.mjs';
+import { D as DataLayerProvider } from '../../dataLayerProvider-BiP3kWix.mjs';
+import { S as StaticCourseManifest } from '../../types-Dbp5DaRR.mjs';
 import { CourseConfig, CourseElo, DataShape } from '@vue-skuilder/common';
-import { S as SkuilderCourseData, Q as QualifiedCardID, T as TagStub, a as Tag } from '../../types-legacy-B8ahaCbj.mjs';
+import { S as SkuilderCourseData, Q as QualifiedCardID, T as TagStub, a as Tag } from '../../types-legacy-6ettoclI.mjs';
 import { S as SyncStrategy, A as AccountCreationResult, a as AuthenticationResult } from '../../SyncStrategy-CyATpyLQ.mjs';
 import 'moment';
 
+interface SkuilderManifest {
+    name?: string;
+    version?: string;
+    description?: string;
+    dependencies?: Record<string, string>;
+}
 interface StaticDataLayerConfig {
-    staticContentPath: string;
     localStoragePrefix?: string;
-    manifests: Record<string, StaticCourseManifest>;
+    rootManifest: SkuilderManifest;
+    rootManifestUrl: string;
 }
 declare class StaticDataLayerProvider implements DataLayerProvider {
     private config;
     private initialized;
     private courseUnpackers;
+    private manifests;
     constructor(config: Partial<StaticDataLayerConfig>);
+    private resolveCourseDependencies;
     initialize(): Promise<void>;
     teardown(): Promise<void>;
     getUserDB(): UserDBInterface;

package/dist/impl/static/index.d.ts

@@ -1,21 +1,29 @@
-import { U as UserDBInterface, C as CourseDBInterface, b as CoursesDBInterface, c as ClassroomDBInterface, A as AdminDBInterface, a as UserDBReader, d as CourseInfo, S as StudySessionNewItem, D as DataLayerResult, e as ContentNavigationStrategyData, f as StudySessionReviewItem, g as ScheduledCard } from '../../userDB-B7zTQ123.js';
-import { D as DataLayerProvider } from '../../dataLayerProvider-juuqUHOP.js';
-import { S as StaticCourseManifest } from '../../types-DtoI27Xh.js';
+import { U as UserDBInterface, C as CourseDBInterface, b as CoursesDBInterface, c as ClassroomDBInterface, A as AdminDBInterface, a as UserDBReader, d as CourseInfo, S as StudySessionNewItem, D as DataLayerResult, e as ContentNavigationStrategyData, f as StudySessionReviewItem, g as ScheduledCard } from '../../userDB-CD6s6ZCp.js';
+import { D as DataLayerProvider } from '../../dataLayerProvider-DSdeyRT3.js';
+import { S as StaticCourseManifest } from '../../types-CewsN87z.js';
 import { CourseConfig, CourseElo, DataShape } from '@vue-skuilder/common';
-import { S as SkuilderCourseData, Q as QualifiedCardID, T as TagStub, a as Tag } from '../../types-legacy-B8ahaCbj.js';
+import { S as SkuilderCourseData, Q as QualifiedCardID, T as TagStub, a as Tag } from '../../types-legacy-6ettoclI.js';
 import { S as SyncStrategy, A as AccountCreationResult, a as AuthenticationResult } from '../../SyncStrategy-CyATpyLQ.js';
 import 'moment';
 
+interface SkuilderManifest {
+    name?: string;
+    version?: string;
+    description?: string;
+    dependencies?: Record<string, string>;
+}
 interface StaticDataLayerConfig {
-    staticContentPath: string;
     localStoragePrefix?: string;
-    manifests: Record<string, StaticCourseManifest>;
+    rootManifest: SkuilderManifest;
+    rootManifestUrl: string;
 }
 declare class StaticDataLayerProvider implements DataLayerProvider {
     private config;
     private initialized;
     private courseUnpackers;
+    private manifests;
     constructor(config: Partial<StaticDataLayerConfig>);
+    private resolveCourseDependencies;
     initialize(): Promise<void>;
     teardown(): Promise<void>;
     getUserDB(): UserDBInterface;

package/dist/impl/static/index.js

@@ -302,7 +302,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) {
@@ -338,6 +340,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]) {
@@ -534,12 +539,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))
     });
   }
@@ -559,6 +626,7 @@ var init_navigators = __esm({
     init_();
     Navigators = /* @__PURE__ */ ((Navigators2) => {
       Navigators2["ELO"] = "elo";
+      Navigators2["HARDCODED"] = "hardcodedOrder";
       return Navigators2;
     })(Navigators || {});
     ContentNavigator = class {
@@ -1392,17 +1460,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}
@@ -2191,16 +2263,20 @@ var init_courseDB3 = __esm({
       async updateCardElo(cardId, _elo) {
         return { ok: true, id: cardId, rev: "1-static" };
       }
-      async getNewCards(limit) {
-        const cardIds = await this.unpacker.queryByElo(1e3, limit || 10);
-        return cardIds.map((cardId) => ({
-          status: "new",
-          qualifiedID: `${this.courseId}-${cardId}`,
-          cardID: cardId,
-          contentSourceType: "course",
-          contentSourceID: this.courseId,
-          courseID: this.courseId
-        }));
+      async getNewCards(limit = 99) {
+        const activeCards = await this.userDB.getActiveCards();
+        return (await this.getCardsCenteredAtELO({ limit, elo: "user" }, (c) => {
+          if (activeCards.some((ac) => c.cardID === ac.cardID)) {
+            return false;
+          } else {
+            return true;
+          }
+        })).map((c) => {
+          return {
+            ...c,
+            status: "new"
+          };
+        });
       }
       async getCardsCenteredAtELO(options, filter) {
         let targetElo = typeof options.elo === "number" ? options.elo : 1e3;
@@ -2381,7 +2457,7 @@ var init_courseDB3 = __esm({
       // Navigation Strategy Manager implementation
       async getNavigationStrategy(_id) {
         return {
-          id: "ELO",
+          _id: "NAVIGATION_STRATEGY-ELO",
           docType: "NAVIGATION_STRATEGY" /* NAVIGATION_STRATEGY */,
           name: "ELO",
           description: "ELO-based navigation strategy",
@@ -2446,11 +2522,17 @@ var init_coursesDB = __esm({
         this.manifests = manifests;
       }
       async getCourseConfig(courseId) {
-        if (!this.manifests[courseId]) {
-          logger.warn(`Course ${courseId} not found`);
-          return {};
+        const manifest = this.manifests[courseId];
+        if (!manifest) {
+          logger.warn(`Course manifest for ${courseId} not found`);
+          throw new Error(`Course ${courseId} not found`);
+        }
+        if (manifest.courseConfig) {
+          return manifest.courseConfig;
+        } else {
+          logger.warn(`Course config not found in manifest for course ${courseId}`);
+          throw new Error(`Course config not found for course ${courseId}`);
         }
-        return {};
       }
       async getCourseList() {
         return Object.keys(this.manifests).map(
@@ -2538,23 +2620,49 @@ var init_StaticDataLayerProvider = __esm({
       config;
       initialized = false;
       courseUnpackers = /* @__PURE__ */ new Map();
+      manifests = {};
       constructor(config) {
         this.config = {
-          staticContentPath: config.staticContentPath || "/static-courses",
           localStoragePrefix: config.localStoragePrefix || "skuilder-static",
-          manifests: config.manifests || {}
+          rootManifest: config.rootManifest || { dependencies: {} },
+          rootManifestUrl: config.rootManifestUrl || "/"
         };
       }
+      async resolveCourseDependencies() {
+        logger.info("[StaticDataLayerProvider] Starting course dependency resolution...");
+        const rootManifest = this.config.rootManifest;
+        for (const [courseName, courseUrl] of Object.entries(rootManifest.dependencies || {})) {
+          try {
+            logger.debug(`[StaticDataLayerProvider] Resolving dependency: ${courseName} from ${courseUrl}`);
+            const courseManifestUrl = new URL(courseUrl, this.config.rootManifestUrl).href;
+            const courseJsonResponse = await fetch(courseManifestUrl);
+            if (!courseJsonResponse.ok) {
+              throw new Error(`Failed to fetch course manifest for ${courseName}`);
+            }
+            const courseJson = await courseJsonResponse.json();
+            if (courseJson.content && courseJson.content.manifest) {
+              const baseUrl = new URL(".", courseManifestUrl).href;
+              const finalManifestUrl = new URL(courseJson.content.manifest, courseManifestUrl).href;
+              const finalManifestResponse = await fetch(finalManifestUrl);
+              if (!finalManifestResponse.ok) {
+                throw new Error(`Failed to fetch final content manifest for ${courseName} at ${finalManifestUrl}`);
+              }
+              const finalManifest = await finalManifestResponse.json();
+              this.manifests[courseName] = finalManifest;
+              const unpacker = new StaticDataUnpacker(finalManifest, baseUrl);
+              this.courseUnpackers.set(courseName, unpacker);
+              logger.info(`[StaticDataLayerProvider] Successfully resolved and prepared course: ${courseName}`);
+            }
+          } catch (e) {
+            logger.error(`[StaticDataLayerProvider] Failed to resolve dependency ${courseName}:`, e);
+          }
+        }
+        logger.info("[StaticDataLayerProvider] Course dependency resolution complete.");
+      }
       async initialize() {
         if (this.initialized) return;
         logger.info("Initializing static data layer provider");
-        for (const [courseId, manifest] of Object.entries(this.config.manifests)) {
-          const unpacker = new StaticDataUnpacker(
-            manifest,
-            `${this.config.staticContentPath}/${courseId}`
-          );
-          this.courseUnpackers.set(courseId, unpacker);
-        }
+        await this.resolveCourseDependencies();
         this.initialized = true;
       }
       async teardown() {
@@ -2568,13 +2676,13 @@ var init_StaticDataLayerProvider = __esm({
       getCourseDB(courseId) {
         const unpacker = this.courseUnpackers.get(courseId);
         if (!unpacker) {
-          throw new Error(`Course ${courseId} not found in static data`);
+          throw new Error(`Course ${courseId} not found or failed to initialize in static data layer.`);
         }
-        const manifest = this.config.manifests[courseId];
+        const manifest = this.manifests[courseId];
         return new StaticCourseDB(courseId, unpacker, this.getUserDB(), manifest);
       }
       getCoursesDB() {
-        return new StaticCoursesDB(this.config.manifests);
+        return new StaticCoursesDB(this.manifests);
       }
       async getClassroomDB(_classId, _type) {
         throw new Error("Classrooms not supported in static mode");