@shaxpir/duiduidui-models 1.4.29 → 1.5.1

package/dist/models/BayesianScore.d.ts

@@ -15,7 +15,7 @@ export declare class BayesianScoreModel {
      * Calculate uncertainty for a given Bayesian score.
      * Higher values indicate less confidence in the theta estimate.
      */
-    static getUncertainty(score: BayesianScore): number;
+    static calculateUncertainty(alpha: number, beta: number): number;
     /**
      * Calculate confidence interval for theta estimate.
      * Uses properties of the Beta distribution to estimate bounds.

package/dist/models/BayesianScore.js

@@ -21,15 +21,15 @@ class BayesianScoreModel {
             nextScore.beta += (weight * 1.0);
         }
         nextScore.theta = nextScore.alpha / (nextScore.alpha + nextScore.beta);
-        nextScore.uncertainty = BayesianScoreModel.getUncertainty(nextScore);
+        nextScore.uncertainty = BayesianScoreModel.calculateUncertainty(nextScore.alpha, nextScore.beta);
         return nextScore;
     }
     /**
      * Calculate uncertainty for a given Bayesian score.
      * Higher values indicate less confidence in the theta estimate.
      */
-    static getUncertainty(score) {
-        return 1 / (score.alpha + score.beta + 1);
+    static calculateUncertainty(alpha, beta) {
+        return 1 / (alpha + beta + 1);
     }
     /**
      * Calculate confidence interval for theta estimate.

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 {
@@ -35,13 +27,10 @@ export declare class Progress extends Content {
     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
             }
         });
@@ -72,10 +71,6 @@ 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)) {
@@ -127,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

@@ -5,12 +5,33 @@ import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
 import { BuiltInPhrase, Phrase, PhraseExample } from './Phrase';
 import { ReviewLike } from "./Review";
 import { ShareSync } from '../repo';
+export interface TermSummary {
+    text: string;
+    sense_rank: number;
+    difficulty: number;
+    phrase_id: number | null;
+    starred_at: CompactDateTime | null;
+    alpha: number;
+    beta: number;
+    theta: number;
+    uncertainty: number;
+    review_count: number;
+    last_review_utc: CompactDateTime;
+}
 export interface TermPayload extends BayesianScore {
     text: string;
     sense_rank: number;
     difficulty: number;
     phrase_id: number | null;
     starred_at: CompactDateTime | null;
+    alpha: number;
+    beta: number;
+    theta: number;
+    uncertainty: number;
+    tags: string[];
+    reviews: ReviewLike[];
+    review_count: number;
+    last_review_utc: CompactDateTime;
     hanzi_count?: number;
     pinyin?: string;
     pinyin_tokenized?: string;
@@ -20,8 +41,6 @@ export interface TermPayload extends BayesianScore {
     components?: PhraseExample[];
     examples?: PhraseExample[];
     keywords?: string[];
-    tags: string[];
-    reviews: ReviewLike[];
 }
 export interface TermBody extends ContentBody {
     meta: ContentMeta;
@@ -47,4 +66,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

@@ -68,8 +68,10 @@ class Term extends Content_1.Content {
                 alpha: 0.5,
                 beta: 0.5,
                 theta: 0.5,
-                uncertainty: BayesianScore_1.BayesianScoreModel.getUncertainty({ alpha: 0.5, beta: 0.5, theta: 0.5, uncertainty: 0 }),
-                reviews: []
+                uncertainty: BayesianScore_1.BayesianScoreModel.calculateUncertainty(0.5, 0.5),
+                reviews: [],
+                review_count: 0,
+                last_review_utc: null
             }
         });
     }
@@ -95,8 +97,10 @@ class Term extends Content_1.Content {
                 alpha: 0.5,
                 beta: 0.5,
                 theta: 0.5,
-                uncertainty: BayesianScore_1.BayesianScoreModel.getUncertainty({ alpha: 0.5, beta: 0.5, theta: 0.5, uncertainty: 0 }),
-                reviews: []
+                uncertainty: BayesianScore_1.BayesianScoreModel.calculateUncertainty(0.5, 0.5),
+                reviews: [],
+                review_count: 0,
+                last_review_utc: null
             }
         });
     }
@@ -154,12 +158,37 @@ class Term extends Content_1.Content {
         batch.setPathValue(['payload', 'alpha'], alpha);
         batch.setPathValue(['payload', 'beta'], beta);
         batch.setPathValue(['payload', 'theta'], theta);
-        batch.setPathValue(['payload', 'uncertainty'], BayesianScore_1.BayesianScoreModel.getUncertainty({ alpha, beta, theta, uncertainty: 0 }));
+        batch.setPathValue(['payload', 'uncertainty'], BayesianScore_1.BayesianScoreModel.calculateUncertainty(alpha, beta));
         batch.commit();
     }
     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.29",
+  "version": "1.5.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"