move abstract Navigator class, remove circular...

imports between ELONavigator and base class. Fiddle with relitive import
paths.

Author: NiloCK

packages/db/src/core/navigators/elo.ts

@@ -1,15 +1,9 @@
-import {
-  CourseDBInterface,
-  ScheduledCard,
-  StudySessionNewItem,
-  StudySessionReviewItem,
-  UserDBInterface,
-} from '..';
-import {
-  ContentNavigationStrategyData,
-  ContentNavigator,
-} from '../types/contentNavigationStrategy';
+import { ScheduledCard } from '../types/user';
+import { CourseDBInterface } from '../interfaces/courseDB';
+import { UserDBInterface } from '../interfaces/userDB';
+import { ContentNavigator } from './index';
 import { CourseElo } from '@vue-skuilder/common';
+import { StudySessionReviewItem, StudySessionNewItem } from '..';
 
 export default class ELONavigator extends ContentNavigator {
   user: UserDBInterface;
@@ -27,7 +21,6 @@ export default class ELONavigator extends ContentNavigator {
   ) {
     super();
     this.user = user;
-    this.user = user;
     this.course = course;
   }
 

packages/db/src/core/navigators/index.ts

@@ -1,3 +1,37 @@
+import {
+  StudyContentSource,
+  UserDBInterface,
+  CourseDBInterface,
+  StudySessionReviewItem,
+  StudySessionNewItem,
+} from '..';
+import { ContentNavigationStrategyData } from '../types/contentNavigationStrategy';
+import { ScheduledCard } from '../types/user';
+
 export enum Navigators {
   ELO = 'elo',
 }
+
+/**
+ * A content-navigator provides runtime steering of study sessions.
+ */
+export abstract class ContentNavigator implements StudyContentSource {
+  /**
+   *
+   * @param user
+   * @param strategyData
+   * @returns the runtime object used to steer a study session.
+   */
+  static create(
+    user: UserDBInterface,
+    course: CourseDBInterface,
+    strategyData: ContentNavigationStrategyData
+  ): ContentNavigator {
+    const implementingClass = strategyData.implementingClass;
+    const NavigatorImpl = require(`./${implementingClass}.ts`).default;
+    return new NavigatorImpl(user, course, strategyData);
+  }
+
+  abstract getPendingReviews(): Promise<(StudySessionReviewItem & ScheduledCard)[]>;
+  abstract getNewCards(n?: number): Promise<StudySessionNewItem[]>;
+}

packages/db/src/core/types/contentNavigationStrategy.ts

@@ -6,7 +6,7 @@ import {
   StudySessionNewItem,
   StudySessionReviewItem,
   UserDBInterface,
-} from '..';
+} from '../index';
 import { Navigators } from '../navigators';
 import ELONavigator from '../navigators/elo';
 
@@ -29,32 +29,3 @@ export interface ContentNavigationStrategyData extends SkuilderCourseData {
   */
   serializedData: string;
 }
-
-/**
- * A content-navigator provides runtime steering of study sessions.
- */
-export abstract class ContentNavigator implements StudyContentSource {
-  /**
-   *
-   * @param user
-   * @param strategyData
-   * @returns the runtime object used to steer a study session.
-   */
-  static create(
-    user: UserDBInterface,
-    course: CourseDBInterface,
-    strategyData: ContentNavigationStrategyData
-  ): ContentNavigator {
-    const implementingClass = strategyData.implementingClass;
-
-    switch (implementingClass) {
-      case Navigators.ELO:
-        return new ELONavigator(user, course);
-      default:
-        throw new Error(`Unknown implementing class: ${implementingClass}`);
-    }
-  }
-
-  abstract getPendingReviews(): Promise<(StudySessionReviewItem & ScheduledCard)[]>;
-  abstract getNewCards(n?: number): Promise<StudySessionNewItem[]>;
-}

packages/db/src/impl/pouch/courseDB.ts

@@ -1,4 +1,10 @@
-import { CourseDBInterface, CourseInfo, CoursesDBInterface, UserDBInterface } from '@/core';
+import {
+  CourseDBInterface,
+  CourseInfo,
+  CoursesDBInterface,
+  StudyContentSourceInternal,
+  UserDBInterface,
+} from '@/core';
 import { ScheduledCard } from '@/core/types/user';
 import {
   CourseConfig,
@@ -23,11 +29,8 @@ import { addNote55, addTagToCard, getCredentialledCourseConfig, getTagID } from
 import { DataLayerResult } from '@/core/types/db';
 import { PouchError } from './types';
 import CourseLookup from './courseLookupDB';
-import {
-  ContentNavigationStrategyData,
-  ContentNavigator,
-} from '@/core/types/contentNavigationStrategy';
-import { Navigators } from '@/core/navigators';
+import { ContentNavigationStrategyData } from '@/core/types/contentNavigationStrategy';
+import { ContentNavigator, Navigators } from '@/core/navigators';
 
 export class CoursesDB implements CoursesDBInterface {
   _courseIDs: string[] | undefined;