@shaxpir/duiduidui-models 1.0.1 → 1.1.0

package/dist/models/{content/Metric.js → Metric.js}

@@ -4,15 +4,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Metric = exports.MetricName = void 0;
+const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
 const dayjs_1 = __importDefault(require("dayjs"));
 const utc_1 = __importDefault(require("dayjs/plugin/utc"));
-dayjs_1.default.extend(utc_1.default);
-const ShareSync_1 = require("../../repo/ShareSync");
-const CachingHasher_1 = require("../../util/CachingHasher");
-const Operation_1 = require("../markup/Operation");
+const repo_1 = require("../repo");
 const Content_1 = require("./Content");
 const ContentKind_1 = require("./ContentKind");
-const Time_1 = require("./Time");
+const Operation_1 = require("./Operation");
+dayjs_1.default.extend(utc_1.default);
 var MetricName;
 (function (MetricName) {
     MetricName["WORD_COUNT"] = "word_count";
@@ -20,7 +19,7 @@ var MetricName;
 })(MetricName || (exports.MetricName = MetricName = {}));
 class Metric extends Content_1.Content {
     static makeMetricId(userId, metricName) {
-        return CachingHasher_1.CachingHasher.makeMd5ContentId(userId + "-metric-" + metricName);
+        return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-metric-" + metricName);
     }
     static create(userId, metricName, entries) {
         const metricId = Metric.makeMetricId(userId, metricName);
@@ -29,18 +28,17 @@ class Metric extends Content_1.Content {
         let maxDate = null;
         for (let d of Object.keys(entries)) {
             const date = d;
-            if (minDate === null || Time_1.Time.compareDate(date, minDate) < 0) {
+            if (minDate === null || shaxpir_common_1.Time.compareDate(date, minDate) < 0) {
                 minDate = date;
             }
-            if (maxDate === null || Time_1.Time.compareDate(date, maxDate) > 0) {
+            if (maxDate === null || shaxpir_common_1.Time.compareDate(date, maxDate) > 0) {
                 maxDate = date;
             }
         }
-        const now = Time_1.MultiClock.now();
-        return ShareSync_1.ShareSyncFactory.get().createContent({
+        const now = shaxpir_common_1.MultiClock.now();
+        return repo_1.ShareSyncFactory.get().createContent({
             meta: {
                 ref: metricId,
-                is_head: true,
                 kind: ContentKind_1.ContentKind.METRIC,
                 id: metricId,
                 owner: userId,
@@ -76,8 +74,8 @@ class Metric extends Content_1.Content {
     }
     get length() {
         this.checkDisposed("Metric.length");
-        const minMoment = dayjs_1.default.utc(this.minDate, Time_1.Time.DATE_FORMAT);
-        const maxMoment = dayjs_1.default.utc(this.maxDate, Time_1.Time.DATE_FORMAT);
+        const minMoment = dayjs_1.default.utc(this.minDate, shaxpir_common_1.Time.DATE_FORMAT);
+        const maxMoment = dayjs_1.default.utc(this.maxDate, shaxpir_common_1.Time.DATE_FORMAT);
         return Math.abs(maxMoment.diff(minMoment, "days")) + 1;
     }
     get(index) {
@@ -89,8 +87,8 @@ class Metric extends Content_1.Content {
             };
         }
         else {
-            const minMoment = dayjs_1.default.utc(this.minDate, Time_1.Time.DATE_FORMAT);
-            const offsetDate = minMoment.add(index, 'days').format(Time_1.Time.DATE_FORMAT);
+            const minMoment = dayjs_1.default.utc(this.minDate, shaxpir_common_1.Time.DATE_FORMAT);
+            const offsetDate = minMoment.add(index, 'days').format(shaxpir_common_1.Time.DATE_FORMAT);
             return {
                 date: offsetDate,
                 amount: this.forDate(offsetDate)
@@ -100,7 +98,7 @@ class Metric extends Content_1.Content {
     sumBetween(minDate, maxDate) {
         this.checkDisposed("Metric.sumBetween");
         let sum = 0;
-        const dates = Time_1.Time.datesBetween(minDate, maxDate);
+        const dates = shaxpir_common_1.Time.datesBetween(minDate, maxDate);
         for (let i = 0, len = dates.length; i < len; i++) {
             const date = dates[i];
             sum += this.forDate(date);
@@ -132,10 +130,10 @@ class Metric extends Content_1.Content {
         const prevMaxDate = this.payload.max_date;
         const batch = new Operation_1.BatchOperation(this);
         batch.setPathValue(['payload', 'entries', date], amount);
-        if (prevMinDate === null || Time_1.Time.compareDate(date, prevMinDate) < 0) {
+        if (prevMinDate === null || shaxpir_common_1.Time.compareDate(date, prevMinDate) < 0) {
             batch.setPathValue(['payload', 'min_date'], date);
         }
-        if (prevMaxDate === null || Time_1.Time.compareDate(date, prevMaxDate) > 0) {
+        if (prevMaxDate === null || shaxpir_common_1.Time.compareDate(date, prevMaxDate) > 0) {
             batch.setPathValue(['payload', 'max_date'], date);
         }
         batch.commit();
@@ -153,10 +151,10 @@ class Metric extends Content_1.Content {
             const prevAmount = this.forDate(date);
             const newAmount = dateAmounts[date];
             batch.setPathValue(['payload', 'entries', date], prevAmount + newAmount);
-            if (minDate === null || Time_1.Time.compareDate(date, minDate) < 0) {
+            if (minDate === null || shaxpir_common_1.Time.compareDate(date, minDate) < 0) {
                 minDate = date;
             }
-            if (maxDate === null || Time_1.Time.compareDate(date, maxDate) > 0) {
+            if (maxDate === null || shaxpir_common_1.Time.compareDate(date, maxDate) > 0) {
                 maxDate = date;
             }
         }

package/dist/models/{content/Model.d.ts → Model.d.ts}

@@ -1,12 +1,10 @@
-/// <reference path="../../../decs.d.ts" />
 import { Doc } from '@shaxpir/sharedb/lib/client';
-import { ShareSync } from '../../repo/ShareSync';
-import { DispatchTopic } from '../../util/Dispatch';
-import { ContentId, ContentMeta, ContentRef } from './Content';
+import { CompactDateTime, DispatchTopic } from '@shaxpir/shaxpir-common';
+import { ShareSync } from '../repo';
+import { ContentId, ContentMeta, ContentRef } from "./Content";
 import { ContentKind } from './ContentKind';
 import { ManifestBody } from './Manifest';
 import { PermissionType } from './Permissions';
-import { CompactDateTime } from './Time';
 export declare abstract class Model {
     static CHANGED: DispatchTopic;
     doc: Doc;

package/dist/models/{content/Model.js → Model.js}

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Model = void 0;
-const Struct_1 = require("../../util/Struct");
-const Dispatch_1 = require("../../util/Dispatch");
-const ChangeModel_1 = require("../markup/ChangeModel");
+const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
 const ContentKind_1 = require("./ContentKind");
 const Permissions_1 = require("./Permissions");
+const ChangeModel_1 = require("./ChangeModel");
 class Model {
     constructor(doc, shouldAcquire, shareSync) {
         this._dataBeforeOpBatch = null;
@@ -24,13 +23,13 @@ class Model {
         }
         const onBeforeOpBatch = function (op, source) {
             if (model._shouldPerformModelChangeAnalysis) {
-                model._dataBeforeOpBatch = Struct_1.Struct.clone(model.doc.data);
+                model._dataBeforeOpBatch = shaxpir_common_1.Struct.clone(model.doc.data);
             }
         };
         const onOpBatch = function (op, source) {
             if (model._shouldPerformModelChangeAnalysis) {
                 // Use tuple-arrays to perform a diff...
-                const dataAfterOpBatch = Struct_1.Struct.clone(model.doc.data);
+                const dataAfterOpBatch = shaxpir_common_1.Struct.clone(model.doc.data);
                 let changeItems = ChangeModel_1.ChangeModel.between(model._dataBeforeOpBatch, dataAfterOpBatch);
                 model._dataBeforeOpBatch = null;
                 // FROM https://share.github.io/sharedb/api/doc ...
@@ -44,7 +43,7 @@ class Model {
                     items: changeItems,
                     op: op
                 };
-                Dispatch_1.Dispatch.publish(Model.CHANGED, change);
+                shaxpir_common_1.Dispatch.publish(Model.CHANGED, change);
             }
         };
         model.doc.on('before op batch', onBeforeOpBatch);

package/dist/models/{markup/Operation.d.ts → Operation.d.ts}

@@ -1,8 +1,6 @@
-/// <reference path="../../../decs.d.ts" />
-import { Op as DeltaOp } from "@shaxpir/quill-delta";
 import { Doc } from '@shaxpir/sharedb/lib/client';
-import { Model } from '../content/Model';
-import { MultiTime } from '../content/Time';
+import { MultiTime } from '@shaxpir/shaxpir-common';
+import { Model } from './Model';
 export type JsonPathElement = string | number;
 export type JsonPath = JsonPathElement[];
 export interface PathVal {
@@ -27,6 +25,5 @@ export declare class BatchOperation {
     pushIntoArray(path: JsonPath, value: any): void;
     removeValueAtPath(path: JsonPath): void;
     replaceValueAtPath(path: JsonPath, value: any): void;
-    applyRichText(path: JsonPath, deltaOps: DeltaOp[]): void;
     commit(): void;
 }

package/dist/models/{markup/Operation.js → Operation.js}

@@ -15,22 +15,30 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BatchOperation = exports.JsonPathSelect = void 0;
-const ShareSync_1 = require("../../repo/ShareSync");
-const Struct_1 = require("../../util/Struct");
-const Content_1 = require("../content/Content");
-const Time_1 = require("../content/Time");
-const TextEditOps_1 = require("./TextEditOps");
-const Json1 = __importStar(require("../../repo/PermissiveJson1"));
-const RichText = require('@shaxpir/rich-text');
+const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
+const TextEditOps_1 = require("../repo/TextEditOps");
+const Json1 = __importStar(require("../repo/PermissiveJson1"));
+const repo_1 = require("../repo");
+const Content_1 = require("./Content");
 const UnicodeText = require('ot-text-unicode');
 ;
 class JsonPathSelect {
@@ -69,12 +77,12 @@ class BatchOperation {
             this.time = time;
         }
         else {
-            this.time = Time_1.MultiClock.now();
+            this.time = shaxpir_common_1.MultiClock.now();
         }
         this.ops = [];
     }
     get at() {
-        return Struct_1.Struct.clone(this.time);
+        return shaxpir_common_1.Struct.clone(this.time);
     }
     hasOps() {
         return this.ops.length > 0;
@@ -87,7 +95,7 @@ class BatchOperation {
             if (prevValue === null) {
                 this.ops.push(Json1.replaceOp(path, prevValue, value));
             }
-            else if (!Struct_1.Struct.equals(prevValue, value)) {
+            else if (!shaxpir_common_1.Struct.equals(prevValue, value)) {
                 const textEditOps = TextEditOps_1.TextEditOps.between(prevValue, value);
                 this.ops.push(Json1.editOp(path, UnicodeText.type, textEditOps));
             }
@@ -99,7 +107,7 @@ class BatchOperation {
     setPathValue(path, value) {
         const prevValue = JsonPathSelect.getValueAtPath(this.model.doc, path);
         if (prevValue !== undefined) {
-            if (!Struct_1.Struct.equals(prevValue, value)) {
+            if (!shaxpir_common_1.Struct.equals(prevValue, value)) {
                 this.ops.push(Json1.replaceOp(path, prevValue, value));
             }
         }
@@ -119,13 +127,13 @@ class BatchOperation {
             if (!Array.isArray(array)) {
                 throw new Error(`path '${JSON.stringify(arrayPath)}' does not refer to an array: ${JSON.stringify(this.model.doc.data)}`);
             }
-            const path = Struct_1.Struct.clone(arrayPath);
+            const path = shaxpir_common_1.Struct.clone(arrayPath);
             path.push(index);
             this.ops.push(Json1.insertOp(path, value));
         }
     }
     unshiftIntoArray(path, value) {
-        path = Struct_1.Struct.clone(path);
+        path = shaxpir_common_1.Struct.clone(path);
         let array = JsonPathSelect.getValueAtPath(this.model.doc, path);
         if (array === undefined) {
             this.ops.push(Json1.insertOp(path, [value]));
@@ -139,7 +147,7 @@ class BatchOperation {
         }
     }
     pushIntoArray(path, value) {
-        path = Struct_1.Struct.clone(path);
+        path = shaxpir_common_1.Struct.clone(path);
         let array = JsonPathSelect.getValueAtPath(this.model.doc, path);
         if (array === undefined) {
             this.ops.push(Json1.insertOp(path, [value]));
@@ -167,9 +175,6 @@ class BatchOperation {
             this.ops.push(Json1.insertOp(path, value));
         }
     }
-    applyRichText(path, deltaOps) {
-        this.ops.push(Json1.editOp(path, RichText.type, deltaOps));
-    }
     commit() {
         const batch = this;
         if (batch.ops.length > 0) {
@@ -179,7 +184,7 @@ class BatchOperation {
                 this.setPathValue(['meta', 'updated_at', 'local_time'], batch.time.local_time);
             }
             const reduced = batch.ops.reduce(Json1.type.compose, null);
-            const shareSync = ShareSync_1.ShareSyncFactory.get();
+            const shareSync = repo_1.ShareSyncFactory.get();
             batch.model.doc.submitOp(reduced, (error) => {
                 if (error) {
                     shareSync.onOperationError(error);

package/dist/models/Phrase.d.ts

@@ -0,0 +1,39 @@
+import { CompactDateTime } from "@shaxpir/shaxpir-common";
+import { ContentId } from "./Content";
+import { ReviewLike } from "./Review";
+export interface PhraseExample {
+    id: number;
+    text: string;
+    pinyin: string;
+    translation: string;
+    learn_rank: number;
+    sense_rank: number;
+}
+export interface Phrase {
+    text: string;
+    hanzi_count: number;
+    sense_rank: number;
+    learn_rank: number;
+    pinyin: string;
+    pinyin_tokenized: string;
+    transliteration: string;
+    translation: string;
+    notes: string;
+    examples?: PhraseExample[];
+    components?: PhraseExample[];
+    keywords?: string[];
+    tags?: string[];
+}
+export interface BuiltInPhrase extends Phrase {
+    id: number;
+}
+export interface AnnotatedPhrase extends Phrase {
+    id: string;
+    phrase_id?: number;
+    content_id?: ContentId;
+    starred_at: CompactDateTime | null;
+    alpha: number;
+    beta: number;
+    proficiency: number;
+    reviews: ReviewLike[];
+}

package/dist/models/{content/Profile.d.ts → Profile.d.ts}

@@ -1,6 +1,5 @@
-/// <reference path="../../../decs.d.ts" />
 import { Doc } from '@shaxpir/sharedb/lib/client';
-import { ShareSync } from '../../repo/ShareSync';
+import { ShareSync } from '../repo';
 import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
 import { MediaCropping } from './Media';
 export interface ProfilePayload {

package/dist/models/{content/Profile.js → Profile.js}

@@ -1,23 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Profile = void 0;
-const ShareSync_1 = require("../../repo/ShareSync");
-const CachingHasher_1 = require("../../util/CachingHasher");
-const Operation_1 = require("../markup/Operation");
+const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
+const repo_1 = require("../repo");
 const Content_1 = require("./Content");
 const ContentKind_1 = require("./ContentKind");
-const Time_1 = require("./Time");
+const Operation_1 = require("./Operation");
 class Profile extends Content_1.Content {
     static makeProfileId(userId) {
-        return CachingHasher_1.CachingHasher.makeMd5ContentId(userId + "-" + ContentKind_1.ContentKind.PROFILE);
+        return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.PROFILE);
     }
     static create(userId) {
-        const now = Time_1.MultiClock.now();
+        const now = shaxpir_common_1.MultiClock.now();
         const profileId = Profile.makeProfileId(userId);
-        return ShareSync_1.ShareSyncFactory.get().createContent({
+        return repo_1.ShareSyncFactory.get().createContent({
             meta: {
                 ref: profileId,
-                is_head: true,
                 kind: ContentKind_1.ContentKind.PROFILE,
                 id: profileId,
                 owner: userId,
@@ -88,7 +86,7 @@ class Profile extends Content_1.Content {
         }
     }
     static async findByUsername(username) {
-        const shareSync = ShareSync_1.ShareSyncFactory.get();
+        const shareSync = repo_1.ShareSyncFactory.get();
         return shareSync.findAndAcquire(ContentKind_1.ContentKind.PROFILE, { "payload.username": username });
     }
 }

package/dist/models/Progress.d.ts

@@ -0,0 +1,26 @@
+import { Doc } from '@shaxpir/sharedb/lib/client';
+import { CompactDateTime } from "@shaxpir/shaxpir-common";
+import { ShareSync } from '../repo';
+import { BayesianScore } from './BayesianScore';
+import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
+export interface PhraseProgress extends BayesianScore {
+    text: string;
+    sense_rank: number;
+    learn_rank: number;
+    last_review_utc?: CompactDateTime;
+}
+export interface ProgressPayload {
+    user_rank: number;
+    phrases: Record<string, PhraseProgress>;
+    cognitive_load: number;
+}
+export interface ProgressBody extends ContentBody {
+    meta: ContentMeta;
+    payload: ProgressPayload;
+}
+export declare class Progress extends Content {
+    static makeProgressId(userId: ContentId): ContentId;
+    static create(userId: ContentId): Progress;
+    constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
+    get payload(): ProgressPayload;
+}

package/dist/models/Progress.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Progress = void 0;
+const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
+const repo_1 = require("../repo");
+const Content_1 = require("./Content");
+const ContentKind_1 = require("./ContentKind");
+class Progress extends Content_1.Content {
+    static makeProgressId(userId) {
+        return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.PROGRESS);
+    }
+    static create(userId) {
+        const now = shaxpir_common_1.MultiClock.now();
+        const progressId = Progress.makeProgressId(userId);
+        return repo_1.ShareSyncFactory.get().createContent({
+            meta: {
+                ref: progressId,
+                kind: ContentKind_1.ContentKind.PROGRESS,
+                id: progressId,
+                owner: userId,
+                created_at: now,
+                updated_at: now
+            },
+            payload: {
+                user_rank: 0,
+                phrases: {},
+                cognitive_load: 0
+            }
+        });
+    }
+    constructor(doc, shouldAcquire, shareSync) {
+        super(doc, shouldAcquire, shareSync);
+    }
+    get payload() {
+        this.checkDisposed("Progress.payload");
+        return this.doc.data.payload;
+    }
+}
+exports.Progress = Progress;

package/dist/models/Review.d.ts

@@ -0,0 +1,14 @@
+import { MultiTime } from "@shaxpir/shaxpir-common";
+export type ReviewResult = 'FAIL' | 'HARD' | 'GOOD' | 'EASY';
+export interface ReviewLike {
+    result: ReviewResult;
+    at: MultiTime;
+}
+export interface Review extends ReviewLike {
+    text: string;
+    sense_rank: number;
+}
+export interface ImpliedReview extends ReviewLike {
+    context: string;
+    weight: number;
+}

package/dist/models/{content/Session.d.ts → Session.d.ts}

@@ -1,19 +1,15 @@
-/// <reference path="../../../decs.d.ts" />
 import { Doc } from '@shaxpir/sharedb/lib/client';
-import { ShareSync } from "../../repo/ShareSync";
-import { Activity } from "./Activity";
-import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
-import { Environment } from "./Environment";
-import { MultiTime } from "./Time";
+import { MultiTime } from "@shaxpir/shaxpir-common";
+import { ShareSync } from '../repo';
+import { Content, ContentBody, ContentId, ContentMeta, ContentRef } from "./Content";
+import { Review } from './Review';
 export interface SessionPayload {
     start: MultiTime;
     end: MultiTime;
     tz_offset: number;
     device_id: ContentId;
     duration_minutes: number;
-    environment: Environment;
-    word_count: number;
-    activity: Activity[];
+    reviews: Review[];
 }
 export interface SessionBody extends ContentBody {
     meta: ContentMeta;
@@ -21,7 +17,8 @@ export interface SessionBody extends ContentBody {
 }
 export declare class Session extends Content {
     static makeSessionId(userId: ContentId): ContentId;
-    static create(userId: ContentId, deviceId: ContentId, environment: Environment): Session;
+    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;
@@ -30,10 +27,5 @@ export declare class Session extends Content {
     get tzOffset(): number;
     get durationMinutes(): number;
     get deviceId(): ContentId;
-    get environment(): Environment;
-    get wordCount(): number;
-    setWordCount(value: number): void;
-    get activity(): Activity[];
-    recordActivity(newActivity: Activity): void;
     modelUpdated(): Promise<void>;
 }

package/dist/models/Session.js

@@ -0,0 +1,103 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Session = void 0;
+const shaxpir_common_1 = require("@shaxpir/shaxpir-common");
+const repo_1 = require("../repo");
+const Content_1 = require("./Content");
+const ContentKind_1 = require("./ContentKind");
+const Metric_1 = require("./Metric");
+const Operation_1 = require("./Operation");
+const Workspace_1 = require("./Workspace");
+class Session extends Content_1.Content {
+    static makeSessionId(userId) {
+        return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.SESSION);
+    }
+    static makeSessionRef(userId, at) {
+        let sessionId = Session.makeSessionId(userId);
+        return `${sessionId}_${at.utc_time}`;
+    }
+    static create(userId, deviceId) {
+        let now = shaxpir_common_1.MultiClock.now();
+        let sessionId = Session.makeSessionId(userId);
+        let sessionRef = Session.makeSessionRef(userId, now);
+        return repo_1.ShareSyncFactory.get().createContent({
+            meta: {
+                ref: sessionRef,
+                kind: ContentKind_1.ContentKind.SESSION,
+                id: sessionId,
+                owner: userId,
+                created_at: now,
+                updated_at: now
+            },
+            payload: {
+                start: now,
+                end: now,
+                tz_offset: (new Date()).getTimezoneOffset(),
+                duration_minutes: 0,
+                device_id: deviceId,
+                reviews: []
+            }
+        });
+    }
+    constructor(doc, shouldAcquire, shareSync) {
+        super(doc, shouldAcquire, shareSync);
+    }
+    get payload() {
+        this.checkDisposed("Session.payload");
+        return this.doc.data.payload;
+    }
+    touch() {
+        this.checkDisposed("Session.touch");
+        const batch = new Operation_1.BatchOperation(this);
+        let nowUtc = batch.at.utc_time;
+        let nowLocal = batch.at.local_time;
+        let minutes = shaxpir_common_1.Time.absDiffMinutes(nowUtc, this.start.utc_time);
+        batch.setPathValue(['payload', 'duration_minutes'], minutes);
+        batch.setPathValue(['payload', 'end', 'utc_time'], nowUtc);
+        batch.setPathValue(['payload', 'end', 'local_time'], nowLocal);
+        batch.commit();
+    }
+    get start() {
+        this.checkDisposed("Session.start");
+        return this.payload.start;
+    }
+    get end() {
+        this.checkDisposed("Session.end");
+        return this.payload.end;
+    }
+    get tzOffset() {
+        this.checkDisposed("Session.tzOffset");
+        return this.payload.tz_offset;
+    }
+    get durationMinutes() {
+        this.checkDisposed("Session.durationMinutes");
+        return this.payload.duration_minutes;
+    }
+    get deviceId() {
+        this.checkDisposed("Session.deviceId");
+        return this.payload.device_id;
+    }
+    async modelUpdated() {
+        this.checkDisposed("Session.modelUpdated");
+        await super.modelUpdated();
+        const shareSync = this.shareSync;
+        const sessionId = this.id;
+        const userId = this.owner;
+        const date = shaxpir_common_1.Time.dateFrom(this.createdAt.local_time);
+        const workspaceId = Workspace_1.Workspace.makeWorkspaceId(userId);
+        const workspace = await this.shareSync.acquire(ContentKind_1.ContentKind.WORKSPACE, workspaceId);
+        const sessionsOnDate = await workspace.acquireSessionsFromDate(sessionId, date);
+        workspace.release();
+        let minutesWritingOnDate = 0;
+        for (let i = 0, len = sessionsOnDate.length; i < len; i++) {
+            const sessionOnDate = sessionsOnDate[i];
+            minutesWritingOnDate += sessionOnDate.durationMinutes;
+            sessionOnDate.release();
+        }
+        const minutesWritingMetricId = Metric_1.Metric.makeMetricId(userId, Metric_1.MetricName.MINUTES_WRITING);
+        const minutesWritingMetric = await shareSync.acquire(ContentKind_1.ContentKind.METRIC, minutesWritingMetricId);
+        minutesWritingMetric.setDateAmount(date, minutesWritingOnDate);
+        minutesWritingMetric.release();
+    }
+}
+exports.Session = Session;

package/dist/models/Term.d.ts

@@ -0,0 +1,36 @@
+import { Doc } from '@shaxpir/sharedb/lib/client';
+import { CompactDateTime } from "@shaxpir/shaxpir-common";
+import { BayesianScore } from './BayesianScore';
+import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
+import { BuiltInPhrase, Phrase, PhraseExample } from './Phrase';
+import { ReviewLike } from "./Review";
+import { ShareSync } from '../repo';
+export interface TermPayload extends BayesianScore {
+    text: string;
+    sense_rank: number;
+    learn_rank: number;
+    phrase_id: number | null;
+    starred_at: CompactDateTime | null;
+    hanzi_count?: number;
+    pinyin?: string;
+    pinyin_tokenized?: string;
+    transliteration?: string;
+    translation?: string;
+    notes?: string;
+    components?: PhraseExample[];
+    examples?: PhraseExample[];
+    keywords?: string[];
+    tags: string[];
+    reviews: ReviewLike[];
+}
+export interface TermBody extends ContentBody {
+    meta: ContentMeta;
+    payload: TermPayload;
+}
+export declare class Term extends Content {
+    static makeTermId(userId: ContentId, text: string, senseRank: number): ContentId;
+    static forUserPhrase(userId: ContentId, phrase: Phrase): Term;
+    static forBuiltinPhrase(userId: ContentId, phrase: BuiltInPhrase): Term;
+    constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
+    get payload(): TermPayload;
+}