Bump ts-fsrs to 4.6.1 (#53)

* bump ts-fsrs to 4.6.1

* Fix/R of DSR is NaN if s equals zero

Author: ishiko732

package.json

@@ -55,7 +55,7 @@
     "sharp": "^0.33.4",
     "tailwind-merge": "^2.3.0",
     "tailwindcss-animate": "^1.0.7",
-    "ts-fsrs": "^4.1.2",
+    "ts-fsrs": "^4.6.1",
     "vaul": "^0.9.1",
     "zod": "^3.23.8"
   },

pnpm-lock.yaml

@@ -17,7 +17,7 @@ export async function GET(request: NextRequest) {
   }
   const page = Number(searchParams.get("page") ?? "1");
   const pageSize = Number(searchParams.get("pageSize") ?? "25");
-  const cards: Card[] = await _findCardsByUid({ uid, page, pageSize });
+  const cards = await _findCardsByUid({ uid, page, pageSize });
   await _reschedule(params.params, cards);
   return NextResponse.json({ success: true });
 }

src/app/api/fsrs/reschedule/route.ts

@@ -4,7 +4,6 @@ import RescheduledSubmitButton from '../submit/RescheduledSubmit';
 import { _findCardsByUid, _reschedule } from '@/lib/reschedule';
 import { getFSRSParamsByUid } from '@/lib/fsrs';
 import { FSRSParameters } from 'ts-fsrs';
-import { Card } from '@prisma/client';
 
 async function rescheduledCardAction(
   uid: number,
@@ -13,7 +12,7 @@ async function rescheduledCardAction(
   pageSize: number = 300
 ) {
   'use server';
-  const cards: Card[] = await _findCardsByUid({ uid, page, pageSize });
+  const cards = await _findCardsByUid({ uid, page, pageSize });
   return await _reschedule(params, cards);
 }
 

src/components/menu/items/RescheduleCard.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Card } from '@prisma/client';
-import { fsrs } from 'ts-fsrs';
+import { fsrs, S_MIN } from 'ts-fsrs';
 import DateItem from '@/lib/formatDate';
 import Forget from './Forget';
 import Suspended from './Suspended';
@@ -10,6 +10,9 @@ type Props = {
 
 export default async function FSRSMsg({ card }: Props) {
   const f = fsrs();
+  // fix: s=0 https://github.com/ishiko732/ts-fsrs-demo/issues/52
+  card.stability = Math.max(S_MIN, card.stability);
+
   const retrievability = f.get_retrievability(card, new Date());
   return (
     <>

src/components/record/FSRSMsg.tsx

@@ -1,7 +1,13 @@
-import { getSessionUserId } from "@/app/(auth)/api/auth/[...nextauth]/session";
-import prisma from "./prisma";
-import { FSRSParameters, fsrs } from "ts-fsrs";
-import { Card, State } from "@prisma/client";
+import { getSessionUserId } from '@/app/(auth)/api/auth/[...nextauth]/session';
+import prisma from './prisma';
+import {
+  FSRSHistory,
+  FSRSParameters,
+  TypeConvert,
+  fsrs,
+  Card as FSRSCard,
+} from 'ts-fsrs';
+import { Card, Revlog, State } from '@prisma/client';
 
 export async function reschedule(
   parameters: FSRSParameters,
@@ -12,27 +18,51 @@ export async function reschedule(
   }
   if (!uid) return false;
 
-  // get all card
+  // get all card and logs
   const cards = await prisma.card.findMany({
     where: {
       note: {
         uid: uid,
       },
       state: State.Review,
     },
+    include: {
+      logs: true,
+    },
     orderBy: {
-      last_review: "asc",
+      last_review: 'asc',
     },
   });
+
   return _reschedule(parameters, cards);
 }
 
-export async function _reschedule(parameters: FSRSParameters, cards: Card[]) {
+export async function _reschedule(
+  parameters: FSRSParameters,
+  cards: (Card & { logs: Revlog[] })[]
+) {
   if (cards.length === 0) {
     return false;
   }
   const f = fsrs(parameters);
-  const rescheduled_cards = f.reschedule(cards);
+
+  const rescheduled_cards: (FSRSCard & { cid: number })[] = [];
+  for (const card of cards) {
+    const logs: FSRSHistory[] = card.logs.map((log) => {
+      return {
+        rating: TypeConvert.rating(log.grade),
+        review: log.review,
+        due: log.due,
+        state: TypeConvert.state(log.state),
+      };
+    });
+    const record = f.reschedule(card, logs);
+    if (record.reschedule_item) {
+      rescheduled_cards.push(
+        record.reschedule_item.card as FSRSCard & { cid: number }
+      );
+    }
+  }
   if (rescheduled_cards.length === 0) {
     return true;
   }
@@ -41,7 +71,11 @@ export async function _reschedule(parameters: FSRSParameters, cards: Card[]) {
     rescheduled_cards.map((data) =>
       prisma.card.update({
         where: { cid: data.cid },
-        data: data,
+        data: {
+          stability: data.stability,
+          difficulty: data.difficulty,
+          due: data.due,
+        },
       })
     )
   );
@@ -57,7 +91,7 @@ type Query = {
   due?: Date;
 };
 
-export async function _findCardsByUid({ uid, page, pageSize, due }: Query) {
+export async function _findCardsByUid({ uid, page, pageSize, due }: Query):Promise<(Card & { logs: Revlog[] })[]> {
   return prisma.card.findMany({
     where: {
       note: {
@@ -72,8 +106,11 @@ export async function _findCardsByUid({ uid, page, pageSize, due }: Query) {
     },
     take: pageSize,
     skip: pageSize * (page - 1),
+    include: {
+      logs: true,
+    },
     orderBy: {
-      last_review: "asc",
+      last_review: 'asc',
     },
   });
 }