@shaxpir/duiduidui-models 1.4.6 → 1.4.8

package/dist/models/Billing.d.ts

@@ -1,4 +1,5 @@
 import { Doc } from '@shaxpir/sharedb/lib/client';
+import { MultiTime } from '@shaxpir/shaxpir-common';
 import { ShareSync } from '../repo';
 import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
 export interface BillingPayload {
@@ -10,7 +11,7 @@ export interface BillingBody extends ContentBody {
 }
 export declare class Billing extends Content {
     static makeBillingId(userId: ContentId): ContentId;
-    static create(userId: ContentId, payload: BillingPayload): Billing;
+    static create(userId: ContentId, payload: BillingPayload, createdAt?: MultiTime): Billing;
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     get payload(): BillingPayload;
 }

package/dist/models/Billing.js

@@ -9,8 +9,10 @@ class Billing extends Content_1.Content {
     static makeBillingId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.BILLING);
     }
-    static create(userId, payload) {
+    static create(userId, payload, createdAt) {
         const now = shaxpir_common_1.MultiClock.now();
+        // If the createdAt time is not provided, use the current time
+        createdAt ??= now;
         const billingId = Billing.makeBillingId(userId);
         return repo_1.ShareSyncFactory.get().createContent({
             meta: {
@@ -18,8 +20,8 @@ class Billing extends Content_1.Content {
                 kind: ContentKind_1.ContentKind.BILLING,
                 id: billingId,
                 owner: userId,
-                created_at: now,
-                updated_at: now
+                created_at: createdAt,
+                updated_at: createdAt
             },
             payload
         });

package/dist/models/Manifest.d.ts

@@ -34,7 +34,7 @@ export interface ManifestPayload {
 export declare class Manifest extends Model {
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     static makeManifestId(userId: ContentId): ContentId;
-    static create(userId: ContentId): Manifest;
+    static create(userId: ContentId, createdAt?: SingleTime): Manifest;
     get meta(): ManifestMeta;
     get owner(): ContentId;
     canUserView(userId: ContentId): boolean;

package/dist/models/Manifest.js

@@ -13,16 +13,16 @@ class Manifest extends Model_1.Model {
     static makeManifestId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.MANIFEST);
     }
-    static create(userId) {
+    static create(userId, createdAt) {
         const now = shaxpir_common_1.Time.utc();
+        // If the createdAt time is not provided, use the current time
+        const createdTime = createdAt ?? { utc_time: now };
         const manifestId = Manifest.makeManifestId(userId);
         return repo_1.ShareSyncFactory.get().createManifest({
             meta: {
                 kind: ContentKind_1.ContentKind.MANIFEST,
                 ref: manifestId,
-                updated_at: {
-                    utc_time: now
-                },
+                updated_at: createdTime,
                 owner: userId
             },
             payload: {

package/dist/models/Progress.d.ts

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

package/dist/models/Progress.js

@@ -36,6 +36,18 @@ class Progress extends Content_1.Content {
         this.checkDisposed("Progress.payload");
         return this.doc.data.payload;
     }
+    getUserRank() {
+        this.checkDisposed("Progress.getUserRank");
+        return this.payload.user_rank;
+    }
+    getCognitiveLoad() {
+        this.checkDisposed("Progress.getCognitiveLoad");
+        return this.payload.cognitive_load;
+    }
+    getPhrases() {
+        this.checkDisposed("Progress.getPhrases");
+        return this.payload.phrases;
+    }
     setUserRank(value) {
         this.checkDisposed("Progress.setUserRank");
         if (this.payload.user_rank !== value) {

package/dist/models/Term.d.ts

@@ -35,6 +35,14 @@ export declare class Term extends Content {
     static forUserPhrase(userId: ContentId, phrase: Phrase): Term;
     static forBuiltinPhrase(userId: ContentId, phrase: BuiltInPhrase): Term;
     get payload(): TermPayload;
+    getText(): string;
+    getSenseRank(): number;
+    getLearnRank(): number;
+    getAlpha(): number;
+    getBeta(): number;
+    getTheta(): number;
+    getReviews(): ReviewLike[];
+    getStarredAt(): CompactDateTime | null;
     setStarredAt(value: CompactDateTime | null): void;
     updateBayesianScore(alpha: number, beta: number, theta: number): void;
     addReview(review: ReviewLike): void;

package/dist/models/Term.js

@@ -101,6 +101,38 @@ class Term extends Content_1.Content {
         this.checkDisposed("Term.payload");
         return this.doc.data.payload;
     }
+    getText() {
+        this.checkDisposed("Term.getText");
+        return this.payload.text;
+    }
+    getSenseRank() {
+        this.checkDisposed("Term.getSenseRank");
+        return this.payload.sense_rank;
+    }
+    getLearnRank() {
+        this.checkDisposed("Term.getLearnRank");
+        return this.payload.learn_rank;
+    }
+    getAlpha() {
+        this.checkDisposed("Term.getAlpha");
+        return this.payload.alpha;
+    }
+    getBeta() {
+        this.checkDisposed("Term.getBeta");
+        return this.payload.beta;
+    }
+    getTheta() {
+        this.checkDisposed("Term.getTheta");
+        return this.payload.theta;
+    }
+    getReviews() {
+        this.checkDisposed("Term.getReviews");
+        return this.payload.reviews;
+    }
+    getStarredAt() {
+        this.checkDisposed("Term.getStarredAt");
+        return this.payload.starred_at;
+    }
     setStarredAt(value) {
         this.checkDisposed("Term.setStarredAt");
         if (this.payload.starred_at !== value) {

package/dist/models/User.js

@@ -28,7 +28,7 @@ class User extends Content_1.Content {
                 id: userId,
                 owner: userId,
                 created_at: createdAt,
-                updated_at: now
+                updated_at: createdAt
             },
             payload: payload
         });

package/dist/models/Workspace.d.ts

@@ -12,10 +12,10 @@ export interface JourneyEntry {
 export interface WorkspacePayload {
     devices: ContentId[];
     sessions: MultiTime[];
-    journey?: {
+    journey: {
         [key: string]: CompactDateTime;
     };
-    global_tags?: TagFilterConfig;
+    global_tags: TagFilterConfig;
 }
 export interface WorkspaceBody extends ContentBody {
     meta: ContentMeta;
@@ -26,12 +26,14 @@ export declare class Workspace extends Content {
     private _sessionsView;
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     get payload(): WorkspacePayload;
+    getGlobalTags(): TagFilterConfig;
     static makeWorkspaceId(userId: ContentId): ContentId;
-    static create(userId: ContentId, deviceId: ContentId): Workspace;
+    static create(userId: ContentId, payload: WorkspacePayload): Workspace;
     get sessions(): ArrayView<MultiTime>;
     get devices(): ArrayView<ContentId>;
     acquireSessionsFromDate(sessionId: ContentId, localDate: CompactDate): Promise<Session[]>;
     hasJourneyDate(journeyKey: string): boolean;
     getJourneyDate(journeyKey: string): CompactDateTime;
     setJourneyDate(journeyKey: string, journeyDate: CompactDateTime): void;
+    setGlobalTags(tags: TagFilterConfig): void;
 }

package/dist/models/Workspace.js

@@ -17,10 +17,14 @@ class Workspace extends Content_1.Content {
     get payload() {
         return this.doc.data.payload;
     }
+    getGlobalTags() {
+        this.checkDisposed("Workspace.getGlobalTags");
+        return this.payload.global_tags;
+    }
     static makeWorkspaceId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.WORKSPACE);
     }
-    static create(userId, deviceId) {
+    static create(userId, payload) {
         const now = shaxpir_common_1.MultiClock.now();
         const workspaceId = Workspace.makeWorkspaceId(userId);
         return repo_1.ShareSyncFactory.get().createContent({
@@ -32,11 +36,7 @@ class Workspace extends Content_1.Content {
                 created_at: now,
                 updated_at: now
             },
-            payload: {
-                devices: [deviceId],
-                journey: {},
-                sessions: []
-            }
+            payload
         });
     }
     get sessions() {
@@ -66,28 +66,25 @@ class Workspace extends Content_1.Content {
     }
     hasJourneyDate(journeyKey) {
         this.checkDisposed("Workspace.hasJourneyDate");
-        return this.payload.hasOwnProperty('journey') && this.payload.journey.hasOwnProperty(journeyKey);
+        return this.payload.journey.hasOwnProperty(journeyKey);
     }
     getJourneyDate(journeyKey) {
         this.checkDisposed("Workspace.getJourneyDate");
-        if (this.payload.hasOwnProperty('journey')) {
-            if (this.payload.journey.hasOwnProperty(journeyKey)) {
-                return this.payload.journey[journeyKey];
-            }
+        if (this.payload.journey.hasOwnProperty(journeyKey)) {
+            return this.payload.journey[journeyKey];
         }
         return null;
     }
     setJourneyDate(journeyKey, journeyDate) {
         this.checkDisposed("Workspace.setJourneyDate");
         const batch = new Operation_1.BatchOperation(this);
-        if (this.payload.hasOwnProperty('journey')) {
-            batch.setPathValue(['payload', 'journey', journeyKey], journeyDate);
-        }
-        else {
-            const journey = {};
-            journey[journeyKey] = journeyDate;
-            batch.setPathValue(['payload', 'journey'], journey);
-        }
+        batch.setPathValue(['payload', 'journey', journeyKey], journeyDate);
+        batch.commit();
+    }
+    setGlobalTags(tags) {
+        this.checkDisposed("Workspace.setGlobalTags");
+        const batch = new Operation_1.BatchOperation(this);
+        batch.setPathValue(['payload', 'global_tags'], tags);
         batch.commit();
     }
 }

package/package.json

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