@timardex/cluemart-shared 1.5.544 → 1.5.545

package/dist/index.mjs

@@ -657,13 +657,14 @@ function computeDailyClueState(dailyClue) {
   const today = nzStartOfDay();
   const start = nzStartOfDay(startDate);
   const end = nzStartOfDay(endDate);
+  if (today.isBefore(start)) {
+    return null;
+  }
   const shuffledPlacements = seededShuffle(
     gameScreenIdentifierList,
     start.toISOString()
   );
-  if (today.isBefore(start)) {
-    return null;
-  }
+  const index = getDayIndex(start, today);
   if (today.isAfter(end)) {
     return {
       todaysClue: null,
@@ -671,31 +672,24 @@ function computeDailyClueState(dailyClue) {
       todaysPlacement: null
     };
   }
-  const index = getDayIndex(start, today);
-  console.log("DEBUG", {
-    collected,
-    end: end.format(),
-    index,
-    shuffled,
-    shuffledPlacements,
-    start: start.format(),
-    today: today.format()
-  });
-  if (index < 0 || index >= shuffled.length) return null;
-  const collectedCount = (collected ?? []).length;
-  if (collectedCount > index) {
+  if (index < 0 || index >= shuffled.length || index >= shuffledPlacements.length) {
+    return null;
+  }
+  const letterToday = shuffled[index];
+  const placement = shuffledPlacements[index];
+  if (!letterToday || !placement) return null;
+  const alreadyCollectedToday = (collected ?? []).includes(letterToday);
+  if (alreadyCollectedToday) {
     return {
       todaysClue: null,
       todaysLetter: null,
       todaysPlacement: null
     };
   }
-  const letterToday = shuffled[index];
-  if (!letterToday) return null;
   return {
-    todaysClue: shuffledPlacements[index].clue,
+    todaysClue: placement.clue,
     todaysLetter: letterToday,
-    todaysPlacement: shuffledPlacements[index].id
+    todaysPlacement: placement.id
   };
 }