@shaxpir/duiduidui-models 1.4.28 → 1.5.0

package/dist/models/Progress.d.ts

@@ -1,14 +1,7 @@
 import { Doc } from '@shaxpir/sharedb/lib/client';
-import { CompactDateTime } from "@shaxpir/shaxpir-common";
 import { ShareSync } from '../repo';
-import { BayesianScore, Bounds } from './BayesianScore';
+import { Bounds } from './BayesianScore';
 import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
-export interface PhraseProgress extends BayesianScore {
-    text: string;
-    sense_rank: number;
-    difficulty: number;
-    last_review_utc?: CompactDateTime;
-}
 export interface UncertainValue {
     value: number;
     uncertainty: number;
@@ -16,7 +9,6 @@ export interface UncertainValue {
 }
 export interface ProgressPayload {
     skill_level: UncertainValue;
-    phrases: Record<string, PhraseProgress>;
     cognitive_load: number;
 }
 export interface ProgressBody extends ContentBody {
@@ -28,18 +20,17 @@ export declare class Progress extends Content {
     static create(userId: ContentId): Progress;
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     get payload(): ProgressPayload;
+    getSkillLevel(): UncertainValue;
     getSkillLevelValue(): number;
     getSkillLevelUncertainty(): number;
     getSkillLevelLowerBound(): number;
     getSkillLevelUpperBound(): number;
     needsCalibration(): boolean;
     getCognitiveLoad(): number;
-    getPhrases(): Record<string, PhraseProgress>;
+    setSkillLevel(uncertainValue: UncertainValue): void;
     setSkillLevelValue(value: number): void;
     setSkillLevelUncertainty(uncertainty: number): void;
     setSkillLevelLowerBound(lowerBound: number): void;
     setSkillLevelUpperBound(upperBound: number): void;
     setCognitiveLoad(value: number): void;
-    updatePhraseProgress(phraseId: string, progress: PhraseProgress): void;
-    updateMultiplePhrases(updates: Record<string, PhraseProgress>): void;
 }

package/dist/models/Progress.js

@@ -31,7 +31,6 @@ class Progress extends Content_1.Content {
                         upper: 1000 // Could potentially be advanced
                     }
                 },
-                phrases: {},
                 cognitive_load: 0
             }
         });
@@ -43,6 +42,10 @@ class Progress extends Content_1.Content {
         this.checkDisposed("Progress.payload");
         return this.doc.data.payload;
     }
+    getSkillLevel() {
+        this.checkDisposed("Progress.getSkillLevel");
+        return shaxpir_common_1.Struct.clone(this.payload.skill_level);
+    }
     getSkillLevelValue() {
         this.checkDisposed("Progress.getSkillLevelValue");
         return this.payload.skill_level.value;
@@ -68,9 +71,16 @@ class Progress extends Content_1.Content {
         this.checkDisposed("Progress.getCognitiveLoad");
         return this.payload.cognitive_load;
     }
-    getPhrases() {
-        this.checkDisposed("Progress.getPhrases");
-        return this.payload.phrases;
+    setSkillLevel(uncertainValue) {
+        this.checkDisposed("Progress.setSkillLevel");
+        if (!shaxpir_common_1.Struct.equals(this.payload.skill_level, uncertainValue)) {
+            const batch = new Operation_1.BatchOperation(this);
+            batch.setPathValue(['payload', 'skill_level', 'value'], uncertainValue.value);
+            batch.setPathValue(['payload', 'skill_level', 'uncertainty'], uncertainValue.uncertainty);
+            batch.setPathValue(['payload', 'skill_level', 'bounds', 'lower'], uncertainValue.bounds.lower);
+            batch.setPathValue(['payload', 'skill_level', 'bounds', 'upper'], uncertainValue.bounds.upper);
+            batch.commit();
+        }
     }
     setSkillLevelValue(value) {
         this.checkDisposed("Progress.setSkillLevelValue");
@@ -112,19 +122,5 @@ class Progress extends Content_1.Content {
             batch.commit();
         }
     }
-    updatePhraseProgress(phraseId, progress) {
-        this.checkDisposed("Progress.updatePhraseProgress");
-        const batch = new Operation_1.BatchOperation(this);
-        batch.setPathValue(['payload', 'phrases', phraseId], progress);
-        batch.commit();
-    }
-    updateMultiplePhrases(updates) {
-        this.checkDisposed("Progress.updateMultiplePhrases");
-        const batch = new Operation_1.BatchOperation(this);
-        for (const [phraseId, progress] of Object.entries(updates)) {
-            batch.setPathValue(['payload', 'phrases', phraseId], progress);
-        }
-        batch.commit();
-    }
 }
 exports.Progress = Progress;

package/dist/models/Term.d.ts

@@ -22,6 +22,8 @@ export interface TermPayload extends BayesianScore {
     keywords?: string[];
     tags: string[];
     reviews: ReviewLike[];
+    review_count: number;
+    last_review_utc: CompactDateTime;
 }
 export interface TermBody extends ContentBody {
     meta: ContentMeta;
@@ -47,4 +49,6 @@ export declare class Term extends Content {
     setStarredAt(value: CompactDateTime | null): void;
     updateBayesianScore(alpha: number, beta: number, theta: number): void;
     addReview(review: ReviewLike): void;
+    getReviewCount(): number;
+    getLastReviewUtc(): CompactDateTime | null;
 }

package/dist/models/Term.js

@@ -69,7 +69,9 @@ class Term extends Content_1.Content {
                 beta: 0.5,
                 theta: 0.5,
                 uncertainty: BayesianScore_1.BayesianScoreModel.getUncertainty({ alpha: 0.5, beta: 0.5, theta: 0.5, uncertainty: 0 }),
-                reviews: []
+                reviews: [],
+                review_count: 0,
+                last_review_utc: null
             }
         });
     }
@@ -96,7 +98,9 @@ class Term extends Content_1.Content {
                 beta: 0.5,
                 theta: 0.5,
                 uncertainty: BayesianScore_1.BayesianScoreModel.getUncertainty({ alpha: 0.5, beta: 0.5, theta: 0.5, uncertainty: 0 }),
-                reviews: []
+                reviews: [],
+                review_count: 0,
+                last_review_utc: null
             }
         });
     }
@@ -160,6 +164,31 @@ class Term extends Content_1.Content {
     addReview(review) {
         this.checkDisposed("Term.addReview");
         this._reviewsView.push(review);
+        // Count reviews again.
+        let reviewCount = 0;
+        let lastReviewUtc = null;
+        this._reviewsView.forEach((idx, r) => {
+            // We only count *actual* reviews, not implied reviews...
+            if (!r.hasOwnProperty('context') && !r.hasOwnProperty('weight')) {
+                const reviewUtc = r.at.utc_time;
+                if (!lastReviewUtc || shaxpir_common_1.Time.isDateTimeAfter(reviewUtc, lastReviewUtc)) {
+                    lastReviewUtc = reviewUtc;
+                }
+                reviewCount++;
+            }
+        });
+        const batch = new Operation_1.BatchOperation(this);
+        batch.setPathValue(['payload', 'review_count'], reviewCount);
+        batch.setPathValue(['payload', 'last_review_utc'], lastReviewUtc);
+        batch.commit();
+    }
+    getReviewCount() {
+        this.checkDisposed("Term.getReviewCount");
+        return this.payload.review_count;
+    }
+    getLastReviewUtc() {
+        this.checkDisposed("Term.getLastReviewUtc");
+        return this.payload.last_review_utc;
     }
 }
 exports.Term = Term;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.4.28",
+  "version": "1.5.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"