@shaxpir/duiduidui-models 1.7.4 → 1.7.6

package/dist/models/Progress.js

@@ -131,7 +131,26 @@ class Progress extends Content_1.Content {
         this.checkDisposed("Progress.setStreaks");
         if (!shaxpir_common_1.Struct.equals(this.payload.streaks, streaks)) {
             const batch = new Operation_1.BatchOperation(this);
-            batch.setPathValue(['payload', 'streaks'], streaks);
+            // If streaks already exist, do field-by-field updates for more granular OT ops
+            if (this.payload.streaks) {
+                // Update daily streak fields
+                batch.setPathValue(['payload', 'streaks', 'daily', 'current'], streaks.daily.current);
+                batch.setPathValue(['payload', 'streaks', 'daily', 'longest'], streaks.daily.longest);
+                // Update weekly streak
+                batch.setPathValue(['payload', 'streaks', 'weekly', 'current'], streaks.weekly.current);
+                // Update monthly streak
+                batch.setPathValue(['payload', 'streaks', 'monthly', 'current'], streaks.monthly.current);
+                // Update last_activity fields
+                batch.setPathValue(['payload', 'streaks', 'last_activity', 'date'], streaks.last_activity.date);
+                batch.setPathValue(['payload', 'streaks', 'last_activity', 'week'], streaks.last_activity.week);
+                batch.setPathValue(['payload', 'streaks', 'last_activity', 'month'], streaks.last_activity.month);
+                // Update total_days
+                batch.setPathValue(['payload', 'streaks', 'total_days'], streaks.total_days);
+            }
+            else {
+                // No existing streaks, set the entire object
+                batch.setPathValue(['payload', 'streaks'], streaks);
+            }
             batch.commit();
         }
     }

package/dist/models/Streaks.js

@@ -94,10 +94,10 @@ class Streaks {
             }
         }
         // Calculate monthly streak
-        // Extract YYYY-MM from CompactDate (format: YYYY-MM-DD)
+        // Extract YYYYMM from CompactDate
         const monthlyActivity = new Set();
         for (const date of activityDates) {
-            const month = date.substring(0, 7); // Extract YYYY-MM
+            const month = shaxpir_common_1.Time.getYearMonth(date);
             monthlyActivity.add(month);
         }
         const sortedMonths = Array.from(monthlyActivity).sort();
@@ -110,10 +110,7 @@ class Streaks {
             }
             else {
                 // Check if consecutive month
-                const [lastYear, lastMonthNum] = lastMonth.split('-').map(Number);
-                const [currentYear, currentMonthNum] = month.split('-').map(Number);
-                if ((currentYear === lastYear && currentMonthNum === lastMonthNum + 1) ||
-                    (currentYear === lastYear + 1 && lastMonthNum === 12 && currentMonthNum === 1)) {
+                if (shaxpir_common_1.Time.areConsecutiveMonths(lastMonth, month)) {
                     monthlyStreak++;
                 }
                 else {
@@ -123,23 +120,13 @@ class Streaks {
             lastMonth = month;
         }
         // Check if current month streak is active
-        const currentMonth = today.substring(0, 7); // Extract YYYY-MM
+        const currentMonth = shaxpir_common_1.Time.getYearMonth(today);
         const lastActiveMonth = sortedMonths[sortedMonths.length - 1];
         const lastMonthDate = shaxpir_common_1.Time.plus(today, -30, 'days');
-        const previousMonth = shaxpir_common_1.Time.dateFrom(lastMonthDate).substring(0, 7);
+        const previousMonth = shaxpir_common_1.Time.getYearMonth(shaxpir_common_1.Time.dateFrom(lastMonthDate));
         if (lastActiveMonth === currentMonth || lastActiveMonth === previousMonth) {
             monthlyCurrent = monthlyStreak;
         }
-        // Get week string for last activity (ISO week format)
-        const getWeekString = (date) => {
-            // Simple week calculation: YYYY-Www where ww is week of year
-            const [year, month, day] = date.split('-').map(Number);
-            const dateObj = new Date(year, month - 1, day);
-            const startOfYear = new Date(year, 0, 1);
-            const dayOfYear = Math.floor((dateObj.getTime() - startOfYear.getTime()) / (24 * 60 * 60 * 1000)) + 1;
-            const weekNumber = Math.ceil(dayOfYear / 7);
-            return `${year}-W${weekNumber.toString().padStart(2, '0')}`;
-        };
         // We know lastDate has a value since activityDates.length > 0
         const finalLastDate = lastDate || activityDates[activityDates.length - 1];
         return {
@@ -155,8 +142,8 @@ class Streaks {
             },
             last_activity: {
                 date: finalLastDate,
-                week: getWeekString(finalLastDate),
-                month: finalLastDate.substring(0, 7)
+                week: shaxpir_common_1.Time.getWeekString(finalLastDate),
+                month: shaxpir_common_1.Time.getYearMonth(finalLastDate)
             },
             total_days: activityDates.length
         };

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@shaxpir/duiduidui-models",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "repository": {
     "type": "git",
     "url": "https://github.com/shaxpir/duiduidui-models"
   },
   "scripts": {
     "build": "tsc",
-    "test": "mocha tests",
-    "test:watch": "mocha -w tests"
+    "test": "npm run build && mocha -r ts-node/register tests/**/*.ts",
+    "test:watch": "npm run build && mocha -r ts-node/register -w tests/**/*.ts"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,16 +18,19 @@
   "dependencies": {
     "@shaxpir/duiduidui-models": "^1.4.14",
     "@shaxpir/sharedb": "^6.0.6",
-    "@shaxpir/shaxpir-common": "1.4.0",
+    "@shaxpir/shaxpir-common": "^1.4.1",
     "ot-json1": "1.0.1",
     "ot-text-unicode": "4.0.0",
     "reconnecting-websocket": "4.4.0"
   },
   "devDependencies": {
+    "@types/chai": "^5.2.3",
     "@types/lodash": "^4.17.20",
+    "@types/mocha": "^10.0.10",
     "@types/node": "^18.0.50",
     "chai": "^4.3.7",
     "mocha": "^10.2.0",
+    "ts-node": "^10.9.2",
     "tslint": "^5.12.1",
     "typescript": "latest"
   }