@shaxpir/duiduidui-models 1.2.1 → 1.3.0

package/dist/models/Progress.d.ts

@@ -23,4 +23,8 @@ export declare class Progress extends Content {
     static create(userId: ContentId): Progress;
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     get payload(): ProgressPayload;
+    setUserRank(value: number): void;
+    setCognitiveLoad(value: number): void;
+    updatePhraseProgress(phraseId: string, progress: PhraseProgress): void;
+    updateMultiplePhrases(updates: Record<string, PhraseProgress>): void;
 }

package/dist/models/Progress.js

@@ -5,6 +5,7 @@ const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
 const repo_1 = require("../repo");
 const Content_1 = require("./Content");
 const ContentKind_1 = require("./ContentKind");
+const Operation_1 = require("./Operation");
 class Progress extends Content_1.Content {
     static makeProgressId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.PROGRESS);
@@ -35,5 +36,35 @@ class Progress extends Content_1.Content {
         this.checkDisposed("Progress.payload");
         return this.doc.data.payload;
     }
+    setUserRank(value) {
+        this.checkDisposed("Progress.setUserRank");
+        if (this.payload.user_rank !== value) {
+            const batch = new Operation_1.BatchOperation(this);
+            batch.setPathValue(['payload', 'user_rank'], value);
+            batch.commit();
+        }
+    }
+    setCognitiveLoad(value) {
+        this.checkDisposed("Progress.setCognitiveLoad");
+        if (this.payload.cognitive_load !== value) {
+            const batch = new Operation_1.BatchOperation(this);
+            batch.setPathValue(['payload', 'cognitive_load'], value);
+            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/Session.d.ts

@@ -16,10 +16,11 @@ export interface SessionBody extends ContentBody {
     payload: SessionPayload;
 }
 export declare class Session extends Content {
+    private _reviewsView;
+    constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     static makeSessionId(userId: ContentId): ContentId;
     static makeSessionRef(userId: ContentId, at: MultiTime): ContentRef;
     static create(userId: ContentId, deviceId: ContentId): Session;
-    constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     get payload(): SessionPayload;
     touch(): void;
     get start(): MultiTime;
@@ -28,4 +29,5 @@ export declare class Session extends Content {
     get durationMinutes(): number;
     get deviceId(): ContentId;
     modelUpdated(): Promise<void>;
+    addReview(review: Review): void;
 }

package/dist/models/Session.js

@@ -8,7 +8,12 @@ const ContentKind_1 = require("./ContentKind");
 const Metric_1 = require("./Metric");
 const Operation_1 = require("./Operation");
 const Workspace_1 = require("./Workspace");
+const ArrayView_1 = require("./ArrayView");
 class Session extends Content_1.Content {
+    constructor(doc, shouldAcquire, shareSync) {
+        super(doc, shouldAcquire, shareSync);
+        this._reviewsView = new ArrayView_1.ArrayView(this, ['payload', 'reviews']);
+    }
     static makeSessionId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.SESSION);
     }
@@ -39,9 +44,6 @@ class Session extends Content_1.Content {
             }
         });
     }
-    constructor(doc, shouldAcquire, shareSync) {
-        super(doc, shouldAcquire, shareSync);
-    }
     get payload() {
         this.checkDisposed("Session.payload");
         return this.doc.data.payload;
@@ -99,5 +101,9 @@ class Session extends Content_1.Content {
         minutesWritingMetric.setDateAmount(date, minutesWritingOnDate);
         minutesWritingMetric.release();
     }
+    addReview(review) {
+        this.checkDisposed("Session.addReview");
+        this._reviewsView.push(review);
+    }
 }
 exports.Session = Session;

package/dist/models/Term.d.ts

@@ -29,8 +29,13 @@ export interface TermBody extends ContentBody {
 }
 export declare class Term extends Content {
     static makeTermId(userId: ContentId, text: string, senseRank: number): ContentId;
+    private _reviewsView;
+    constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
+    static forUserPhrase(userId: ContentId, text: string, senseRank: number, learnRank: number, phraseId?: number): Term;
     static forUserPhrase(userId: ContentId, phrase: Phrase): Term;
     static forBuiltinPhrase(userId: ContentId, phrase: BuiltInPhrase): Term;
-    constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     get payload(): TermPayload;
+    setStarredAt(value: CompactDateTime | null): void;
+    updateBayesianScore(alpha: number, beta: number, theta: number): void;
+    addReview(review: ReviewLike): void;
 }

package/dist/models/Term.js

@@ -5,15 +5,41 @@ const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
 const Content_1 = require("./Content");
 const ContentKind_1 = require("./ContentKind");
 const repo_1 = require("../repo");
+const Operation_1 = require("./Operation");
+const ArrayView_1 = require("./ArrayView");
 class Term extends Content_1.Content {
     static makeTermId(userId, text, senseRank) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(`${ContentKind_1.ContentKind.TERM}-${userId}-${text}-${senseRank}`);
     }
-    static forUserPhrase(userId, phrase) {
+    constructor(doc, shouldAcquire, shareSync) {
+        super(doc, shouldAcquire, shareSync);
+        this._reviewsView = new ArrayView_1.ArrayView(this, ['payload', 'reviews']);
+    }
+    static forUserPhrase(userId, textOrPhrase, senseRank, learnRank, phraseId) {
         const now = shaxpir_common_1.MultiClock.now();
+        // Handle overloaded parameters
+        let phrase;
+        if (typeof textOrPhrase === 'string') {
+            // Create a minimal Phrase object from individual parameters
+            phrase = {
+                text: textOrPhrase,
+                sense_rank: senseRank,
+                learn_rank: learnRank,
+                hanzi_count: textOrPhrase.length,
+                pinyin: '',
+                pinyin_tokenized: '',
+                transliteration: '',
+                translation: '',
+                notes: '',
+                examples: [],
+                keywords: [],
+                tags: []
+            };
+        }
+        else {
+            phrase = textOrPhrase;
+        }
         const termId = shaxpir_common_1.CachingHasher.makeMd5Base62Hash(`${userId}-${phrase.text}-${phrase.sense_rank}`);
-        const initalAlpha = phrase.learn_rank < 100 ? 1 : 2;
-        const initalBeta = phrase.learn_rank < 100 ? 1 : 2;
         return repo_1.ShareSyncFactory.get().createContent({
             meta: {
                 ref: termId,
@@ -24,7 +50,7 @@ class Term extends Content_1.Content {
                 updated_at: now
             },
             payload: {
-                phrase_id: null,
+                phrase_id: (typeof textOrPhrase === 'string' && phraseId) ? phraseId : null,
                 text: phrase.text,
                 sense_rank: phrase.sense_rank,
                 hanzi_count: phrase.hanzi_count,
@@ -71,12 +97,29 @@ class Term extends Content_1.Content {
             }
         });
     }
-    constructor(doc, shouldAcquire, shareSync) {
-        super(doc, shouldAcquire, shareSync);
-    }
     get payload() {
         this.checkDisposed("Term.payload");
         return this.doc.data.payload;
     }
+    setStarredAt(value) {
+        this.checkDisposed("Term.setStarredAt");
+        if (this.payload.starred_at !== value) {
+            const batch = new Operation_1.BatchOperation(this);
+            batch.setPathValue(['payload', 'starred_at'], value);
+            batch.commit();
+        }
+    }
+    updateBayesianScore(alpha, beta, theta) {
+        this.checkDisposed("Term.updateBayesianScore");
+        const batch = new Operation_1.BatchOperation(this);
+        batch.setPathValue(['payload', 'alpha'], alpha);
+        batch.setPathValue(['payload', 'beta'], beta);
+        batch.setPathValue(['payload', 'theta'], theta);
+        batch.commit();
+    }
+    addReview(review) {
+        this.checkDisposed("Term.addReview");
+        this._reviewsView.push(review);
+    }
 }
 exports.Term = Term;

package/dist/repo/ShareSync.js

@@ -48,12 +48,9 @@ const Manifest_1 = require("../models/Manifest");
 const User_1 = require("../models/User");
 // Register the ShareDB types
 const Json1 = __importStar(require("./PermissiveJson1"));
-const RichText = require('@shaxpir/rich-text');
 const UnicodeText = require('ot-text-unicode');
 client_1.default.types.register(Json1.type);
-client_1.default.types.register(RichText.type);
 client_1.default.types.register(UnicodeText.type);
-Json1.type.registerSubtype(RichText.type);
 Json1.type.registerSubtype(UnicodeText.type);
 var ShareSyncDisposalStrategy;
 (function (ShareSyncDisposalStrategy) {

package/lib/models/Progress.ts

@@ -4,6 +4,7 @@ import { ShareSync, ShareSyncFactory } from '../repo';
 import { BayesianScore } from './BayesianScore';
 import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
 import { ContentKind } from './ContentKind';
+import { BatchOperation } from './Operation';
 
 export interface PhraseProgress extends BayesianScore {
   text:string;
@@ -63,4 +64,38 @@ export class Progress extends Content {
     this.checkDisposed("Progress.payload");
     return this.doc.data.payload as ProgressPayload;
   }
+
+  public setUserRank(value: number): void {
+    this.checkDisposed("Progress.setUserRank");
+    if (this.payload.user_rank !== value) {
+      const batch = new BatchOperation(this);
+      batch.setPathValue(['payload', 'user_rank'], value);
+      batch.commit();
+    }
+  }
+
+  public setCognitiveLoad(value: number): void {
+    this.checkDisposed("Progress.setCognitiveLoad");
+    if (this.payload.cognitive_load !== value) {
+      const batch = new BatchOperation(this);
+      batch.setPathValue(['payload', 'cognitive_load'], value);
+      batch.commit();
+    }
+  }
+
+  public updatePhraseProgress(phraseId: string, progress: PhraseProgress): void {
+    this.checkDisposed("Progress.updatePhraseProgress");
+    const batch = new BatchOperation(this);
+    batch.setPathValue(['payload', 'phrases', phraseId], progress);
+    batch.commit();
+  }
+
+  public updateMultiplePhrases(updates: Record<string, PhraseProgress>): void {
+    this.checkDisposed("Progress.updateMultiplePhrases");
+    const batch = new BatchOperation(this);
+    for (const [phraseId, progress] of Object.entries(updates)) {
+      batch.setPathValue(['payload', 'phrases', phraseId], progress);
+    }
+    batch.commit();
+  }
 }

package/lib/models/Session.ts

@@ -7,6 +7,7 @@ import { Metric, MetricName } from './Metric';
 import { BatchOperation } from './Operation';
 import { Review } from './Review';
 import { Workspace } from './Workspace';
+import { ArrayView } from './ArrayView';
 
 
 export interface SessionPayload {
@@ -25,6 +26,13 @@ export interface SessionBody extends ContentBody {
 
 export class Session extends Content {
 
+  private _reviewsView:ArrayView<Review>;
+
+  constructor(doc:Doc, shouldAcquire:boolean, shareSync:ShareSync) {
+    super(doc, shouldAcquire, shareSync);
+    this._reviewsView = new ArrayView(this, [ 'payload', 'reviews' ]);
+  }
+
   public static makeSessionId(userId:ContentId):ContentId {
     return CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind.SESSION) as ContentId;
   }
@@ -65,10 +73,6 @@ export class Session extends Content {
     ) as Session;
   }
 
-  constructor(doc:Doc, shouldAcquire:boolean, shareSync:ShareSync) {
-    super(doc, shouldAcquire, shareSync);
-  }
-
   public get payload():SessionPayload {
     this.checkDisposed("Session.payload");
     return this.doc.data.payload;
@@ -137,4 +141,9 @@ export class Session extends Content {
     minutesWritingMetric.setDateAmount(date, minutesWritingOnDate);
     minutesWritingMetric.release();
   }
+
+  public addReview(review: Review): void {
+    this.checkDisposed("Session.addReview");
+    this._reviewsView.push(review);
+  }
 }

package/lib/models/Term.ts

@@ -6,6 +6,8 @@ import { BuiltInPhrase, Phrase, PhraseExample } from './Phrase';
 import { ReviewLike } from "./Review";
 import { ContentKind } from './ContentKind';
 import { ShareSync, ShareSyncFactory } from '../repo';
+import { BatchOperation } from './Operation';
+import { ArrayView } from './ArrayView';
 
 export interface TermPayload extends BayesianScore {
 
@@ -46,14 +48,56 @@ export class Term extends Content {
     return CachingHasher.makeMd5Base62Hash(`${ContentKind.TERM}-${userId}-${text}-${senseRank}`) as ContentId;
   }
 
+  private _reviewsView:ArrayView<ReviewLike>;
+
+  constructor(doc:Doc, shouldAcquire:boolean, shareSync:ShareSync) {
+    super(doc, shouldAcquire, shareSync);
+    this._reviewsView = new ArrayView(this, [ 'payload', 'reviews' ]);
+  }
+
+  public static forUserPhrase(
+    userId:ContentId,
+    text:string,
+    senseRank:number,
+    learnRank:number,
+    phraseId?:number
+  ):Term;
   public static forUserPhrase(
     userId:ContentId,
     phrase:Phrase
+  ):Term;
+  public static forUserPhrase(
+    userId:ContentId,
+    textOrPhrase:string | Phrase,
+    senseRank?:number,
+    learnRank?:number,
+    phraseId?:number
   ):Term {
     const now = MultiClock.now();
+    
+    // Handle overloaded parameters
+    let phrase: Phrase;
+    if (typeof textOrPhrase === 'string') {
+      // Create a minimal Phrase object from individual parameters
+      phrase = {
+        text: textOrPhrase,
+        sense_rank: senseRank!,
+        learn_rank: learnRank!,
+        hanzi_count: textOrPhrase.length,
+        pinyin: '',
+        pinyin_tokenized: '',
+        transliteration: '',
+        translation: '',
+        notes: '',
+        examples: [],
+        keywords: [],
+        tags: []
+      } as Phrase;
+    } else {
+      phrase = textOrPhrase;
+    }
+    
     const termId = CachingHasher.makeMd5Base62Hash(`${userId}-${phrase.text}-${phrase.sense_rank}`) as ContentId;
-    const initalAlpha = phrase.learn_rank < 100 ? 1 : 2;
-    const initalBeta = phrase.learn_rank < 100 ? 1 : 2;
     return ShareSyncFactory.get().createContent(
       {
         meta : {
@@ -66,7 +110,7 @@ export class Term extends Content {
         },
         payload : {
 
-          phrase_id : null,
+          phrase_id : (typeof textOrPhrase === 'string' && phraseId) ? phraseId : null,
           text : phrase.text,
           sense_rank : phrase.sense_rank,
           hanzi_count : phrase.hanzi_count,
@@ -128,12 +172,31 @@ export class Term extends Content {
     ) as Term;
   }
 
-  constructor(doc:Doc, shouldAcquire:boolean, shareSync:ShareSync) {
-    super(doc, shouldAcquire, shareSync);
-  }
-
   public get payload():TermPayload {
     this.checkDisposed("Term.payload");
     return this.doc.data.payload as TermPayload;
   }
+
+  public setStarredAt(value: CompactDateTime | null): void {
+    this.checkDisposed("Term.setStarredAt");
+    if (this.payload.starred_at !== value) {
+      const batch = new BatchOperation(this);
+      batch.setPathValue(['payload', 'starred_at'], value);
+      batch.commit();
+    }
+  }
+
+  public updateBayesianScore(alpha: number, beta: number, theta: number): void {
+    this.checkDisposed("Term.updateBayesianScore");
+    const batch = new BatchOperation(this);
+    batch.setPathValue(['payload', 'alpha'], alpha);
+    batch.setPathValue(['payload', 'beta'], beta);
+    batch.setPathValue(['payload', 'theta'], theta);
+    batch.commit();
+  }
+
+  public addReview(review: ReviewLike): void {
+    this.checkDisposed("Term.addReview");
+    this._reviewsView.push(review);
+  }
 }

package/lib/repo/ShareSync.ts

@@ -13,14 +13,11 @@ import { ConnectionListener } from './ConnectionListener';
 // Register the ShareDB types
 import * as Json1 from './PermissiveJson1';
 
-const RichText = require('@shaxpir/rich-text');
 const UnicodeText = require('ot-text-unicode');
 
 ShareDB.types.register(Json1.type);
-ShareDB.types.register(RichText.type);
 ShareDB.types.register(UnicodeText.type);
 
-Json1.type.registerSubtype(RichText.type);
 Json1.type.registerSubtype(UnicodeText.type);
 
 export enum ShareSyncDisposalStrategy {

package/package.json

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