@shaxpir/duiduidui-models 1.12.0 → 1.13.0

package/dist/models/Billing.d.ts

@@ -1,9 +1,19 @@
 import { Doc } from '@shaxpir/sharedb/lib/client';
-import { MultiTime } from '@shaxpir/shaxpir-common';
+import { CompactDateTime, MultiTime } from '@shaxpir/shaxpir-common';
 import { ShareSync } from '../repo';
 import { Content, ContentBody, ContentId, ContentMeta } from "./Content";
+export type SubscriptionStatus = 'active' | 'trialing' | 'grace_period' | 'expired' | 'inactive';
+export type SubscriptionSource = 'app_store' | 'stripe' | 'promo' | 'lifetime_free';
 export interface BillingPayload {
-    stripe_customer_id: string;
+    subscription_status: SubscriptionStatus;
+    subscription_source: SubscriptionSource | null;
+    expires_at: CompactDateTime | null;
+    renewed_at: CompactDateTime | null;
+    app_store_product_id: string | null;
+    app_store_original_transaction_id: string | null;
+    stripe_customer_id: string | null;
+    stripe_subscription_id: string | null;
+    grant_note: string | null;
 }
 export interface BillingBody extends ContentBody {
     meta: ContentMeta;
@@ -11,7 +21,14 @@ export interface BillingBody extends ContentBody {
 }
 export declare class Billing extends Content {
     static makeBillingId(userId: ContentId): ContentId;
-    static create(userId: ContentId, payload: BillingPayload, createdAt?: MultiTime): Billing;
+    static createDefaultPayload(): BillingPayload;
+    static create(userId: ContentId, payload?: BillingPayload, createdAt?: MultiTime): Billing;
     constructor(doc: Doc, shouldAcquire: boolean, shareSync: ShareSync);
     get payload(): BillingPayload;
+    get subscriptionStatus(): SubscriptionStatus;
+    get subscriptionSource(): SubscriptionSource | null;
+    get expiresAt(): CompactDateTime | null;
+    isActive(): boolean;
+    isTrialing(): boolean;
+    isLifetimeFree(): boolean;
 }

package/dist/models/Billing.js

@@ -9,10 +9,23 @@ class Billing extends Content_1.Content {
     static makeBillingId(userId) {
         return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(userId + "-" + ContentKind_1.ContentKind.BILLING);
     }
+    static createDefaultPayload() {
+        return {
+            subscription_status: 'inactive',
+            subscription_source: null,
+            expires_at: null,
+            renewed_at: null,
+            app_store_product_id: null,
+            app_store_original_transaction_id: null,
+            stripe_customer_id: null,
+            stripe_subscription_id: null,
+            grant_note: null
+        };
+    }
     static create(userId, payload, createdAt) {
         const now = shaxpir_common_1.ClockService.getClock().now();
-        // If the createdAt time is not provided, use the current time
         createdAt ??= now;
+        payload ??= Billing.createDefaultPayload();
         const billingId = Billing.makeBillingId(userId);
         return repo_1.ShareSyncFactory.get().createContent({
             meta: {
@@ -33,5 +46,24 @@ class Billing extends Content_1.Content {
         this.checkDisposed("Billing.payload");
         return this.doc.data.payload;
     }
+    get subscriptionStatus() {
+        return this.payload.subscription_status;
+    }
+    get subscriptionSource() {
+        return this.payload.subscription_source;
+    }
+    get expiresAt() {
+        return this.payload.expires_at;
+    }
+    isActive() {
+        const status = this.subscriptionStatus;
+        return status === 'active' || status === 'trialing' || status === 'grace_period';
+    }
+    isTrialing() {
+        return this.subscriptionStatus === 'trialing';
+    }
+    isLifetimeFree() {
+        return this.subscriptionSource === 'lifetime_free';
+    }
 }
 exports.Billing = Billing;

package/dist/models/Term.d.ts

@@ -55,7 +55,7 @@ export interface TermBody extends ContentBody {
     payload: TermPayload;
 }
 export declare class Term extends Content {
-    static makeTermId(userId: ContentId, text: string, senseRank: number): ContentId;
+    static makeTermId(userId: ContentId, type: RecordType, text: string, senseRank: number): ContentId;
     private _reviewsView;
     private _impliedReviewsView;
     private _userTagsView;

package/dist/models/Term.js

@@ -10,8 +10,8 @@ const ContentKind_1 = require("./ContentKind");
 const Operation_1 = require("./Operation");
 const RecordType_1 = require("./RecordType");
 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 makeTermId(userId, type, text, senseRank) {
+        return shaxpir_common_1.CachingHasher.makeMd5Base62Hash(`${ContentKind_1.ContentKind.TERM}-${userId}-${type}-${text}-${senseRank}`);
     }
     constructor(doc, shouldAcquire, shareSync) {
         super(doc, shouldAcquire, shareSync);
@@ -53,7 +53,7 @@ class Term extends Content_1.Content {
             recordType = senseRankOrType;
             resolvedPhraseId = undefined;
         }
-        const termId = Term.makeTermId(userId, phrase.text, phrase.sense_rank);
+        const termId = Term.makeTermId(userId, recordType, phrase.text, phrase.sense_rank);
         return repo_1.ShareSyncFactory.get().createContent({
             meta: {
                 ref: termId,
@@ -94,7 +94,8 @@ class Term extends Content_1.Content {
     }
     static forBuiltinPhrase(userId, phrase) {
         const now = shaxpir_common_1.ClockService.getClock().now();
-        const termId = Term.makeTermId(userId, phrase.text, phrase.sense_rank);
+        const resolvedType = phrase.type ?? (0, RecordType_1.getRecordTypeFromId)(phrase.id);
+        const termId = Term.makeTermId(userId, resolvedType, phrase.text, phrase.sense_rank);
         return repo_1.ShareSyncFactory.get().createContent({
             meta: {
                 ref: termId,
@@ -109,7 +110,7 @@ class Term extends Content_1.Content {
                 sense_rank: phrase.sense_rank,
                 // difficulty intentionally omitted for built-in phrases - always read from database
                 phrase_id: phrase.id,
-                type: phrase.type ?? (0, RecordType_1.getRecordTypeFromId)(phrase.id), // Use phrase.type if available, else derive from ID
+                type: resolvedType,
                 starred_at: null,
                 user_tags: [],
                 user_tag_count: 0,

package/package.json

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