chore: 1.7.6

bun.lock

@@ -1,5 +1,6 @@
 {
   "lockfileVersion": 1,
+  "configVersion": 0,
   "workspaces": {
     "": {
       "name": "tout-doux",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "tout-doux",
-    "version": "1.7.2",
+    "version": "1.7.6",
     "private": true,
     "type": "module",
     "engines": {

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tout-doux"
-version = "1.7.2"
+version = "1.7.6"
 description = ""
 requires-python = ">=3.14"
 dependencies = [

resources/ts/components/AlertsContainer.vue

@@ -1,9 +1,6 @@
 <script setup lang="ts">
 import { useAlertStore } from "@/stores/alerts";
-import { defineAsyncComponent } from "vue";
-const AlertItem = defineAsyncComponent(
-    () => import("@/components/AlertItem.vue"),
-);
+import AlertItem from "@/components/AlertItem.vue";
 
 const { alerts } = useAlertStore();
 </script>

resources/ts/components/CronInput.vue

@@ -1,10 +1,8 @@
 <script setup lang="ts">
-import { ref, onBeforeMount, watch, defineAsyncComponent } from "vue";
+import { ref, onBeforeMount, watch } from "vue";
 import { getCron, parseCron, validCron } from "@/lib/recurrence";
 import { CronType } from "@/enums";
-const DateInput = defineAsyncComponent(
-    () => import("@/components/DateInput.vue"),
-);
+import DateInput from "@/components/DateInput.vue";
 
 const DEFAULT_CRON = "0 0 * * *";
 
@@ -116,20 +114,6 @@ watch(cron, () => {
                 {{ $t("cron.type.one_time") }}
             </option>
         </select>
-        <select
-            v-if="cronType === CronType.EVERY_DAY"
-            v-model="cronValue"
-            class="select flex-1"
-            @change="onChangeCronValue"
-        >
-            <option
-                v-for="i in Array.from(Array(24).keys())"
-                :key="`h${i + 1}`"
-                :value="i"
-            >
-                {{ i.toFixed(0).padStart(2, "0") }}:00
-            </option>
-        </select>
         <select
             v-if="cronType === CronType.EVERY_WEEK"
             v-model="cronValue"

resources/ts/components/PageFooter.vue

@@ -1,17 +1,13 @@
 <script setup lang="ts">
 import { getMetadata } from "@/api/meta";
 import type { Metadata } from "@/types";
-import { defineAsyncComponent, onBeforeMount, ref } from "vue";
+import { onBeforeMount, ref } from "vue";
+import LangInput from "@/components/LangInput.vue";
 
-const metadata = ref<Metadata|null>(null);
-
-const LangInput = defineAsyncComponent(
-    () => import("@/components/LangInput.vue"),
-);
+const metadata = ref<Metadata | null>(null);
 
 function fetchMetadata() {
-    void getMetadata()
-        .then((data) => {
+    void getMetadata().then((data) => {
         metadata.value = data;
         setTimeout(fetchMetadata, 600000);
     });

resources/ts/components/TaskItem.vue

@@ -4,15 +4,12 @@ import {
     ref,
     watch,
     computed,
-    defineAsyncComponent,
     nextTick,
 } from "vue";
 import type { Task } from "@/types";
 import { CopyIcon, TrashIcon, SaveIcon, XIcon } from "@lucide/vue";
 import { updateTask } from "@/api/tasks";
-const CronInput = defineAsyncComponent(
-    () => import("@/components/CronInput.vue"),
-);
+import CronInput from "@/components/CronInput.vue";
 import {
     isTemporary,
     taskCompleted,

resources/ts/lib/recurrence.ts

@@ -22,7 +22,7 @@ export function parseCron(cron: string | null): {
             value: 0,
             date: null,
         };
-    } else if (cron.startsWith("RRULE:") || cron.startsWith("DTSTART:")) {
+    } else if (isRrule(cron)) {
         return parseRrule(cron);
     } else if ((value = /^0 (\d+) \* \* \*$/i.exec(cron)) !== null) {
         return {
@@ -75,6 +75,10 @@ export function parseCron(cron: string | null): {
     }
 }
 
+function isRrule(cron: string): boolean {
+    return cron.startsWith("RRULE:") || cron.startsWith("DTSTART:");
+}
+
 export function parseRrule(rule: string): {
     type: CronType;
     value: number;
@@ -128,7 +132,7 @@ export function getCron(
         case CronType.ONE_TIME:
             return ONE_TIME_VALUE;
         case CronType.EVERY_DAY:
-            return `0 ${value.toFixed(0)} * * *`;
+            return `0 0 * * *`;
         case CronType.EVERY_WEEK:
             return `0 0 * * ${value.toFixed(0)}`;
         case CronType.EVERY_MONTH:
@@ -171,10 +175,6 @@ export function getCron(
     return null;
 }
 
-function dtStartFormat(date: Date): string {
-    return `${date.getFullYear().toFixed(0)}${(date.getMonth() + 1).toFixed(0).padStart(2, "0")}${date.getDate().toFixed(0).padStart(2, "0")}T000000Z`;
-}
-
 export function isOneTime(cron: string | null): boolean {
     return cron === ONE_TIME_VALUE;
 }
@@ -197,7 +197,7 @@ export function nextCronReset(
         return null;
     }
     try {
-        if (cron.startsWith("RRULE:")) {
+        if (isRrule(cron)) {
             try {
                 const rule = new RRule({
                     ...RRule.parseString(cron),

resources/ts/lib/tasks.ts

@@ -35,11 +35,27 @@ export function isTemporary(task: Task): boolean {
 }
 
 export function taskNextReset(task: Task): Date | null {
-    return nextCronReset(task.check_date ?? new Date(), task.reset_cron, task.id);
+    return nextCronReset(
+        task.check_date ?? new Date(),
+        task.reset_cron,
+        task.id,
+    );
 }
 
 export function taskFutureReset(task: Task): Date | null {
-    return nextCronReset(taskNextReset(task) ?? new Date(), task.reset_cron, task.id);
+    return nextCronReset(
+        taskNextReset(task) ?? new Date(),
+        task.reset_cron,
+        task.id,
+    );
+}
+
+export function taskSortReset(task: Task): Date | null {
+    let resetDate = taskNextReset(task);
+    while (resetDate !== null && resetDate.getTime() < new Date().getTime()) {
+        resetDate = nextCronReset(resetDate, task.reset_cron, task.id);
+    }
+    return resetDate;
 }
 
 export function taskCompleted(task: Task): boolean {
@@ -53,54 +69,43 @@ export function taskCompleted(task: Task): boolean {
     return nextReset.getTime() > new Date().getTime();
 }
 
-export function sortTasks(
-    tasks: Task[],
+export function fallbackDate(task: Task): Date {
+    return new Date(
+        (task.check_date ?? task.created_at).getFullYear() + 100,
+        (task.check_date ?? task.created_at).getMonth(),
+        (task.check_date ?? task.created_at).getDate(),
+        0,
+        0,
+        0,
+        0,
+    );
+}
+
+export function taskSortFunction(
     sortType: SortType,
     reverse: boolean,
-): Task[] {
+): (a: Task, b: Task) => number {
     switch (sortType) {
         case SortType.CREATED_AT:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
+            return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) *
-                        (a.created_at.getTime() - b.created_at.getTime()),
-                );
+                (a.created_at.getTime() - b.created_at.getTime());
         case SortType.UPDATED_AT:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
+            return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) *
-                        (a.updated_at.getTime() - b.updated_at.getTime()),
-                );
+                (a.updated_at.getTime() - b.updated_at.getTime());
         case SortType.CHECK_DATE:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
+            return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) *
-                        ((a.check_date ?? a.created_at).getTime() -
-                            (b.check_date ?? b.created_at).getTime()),
-                );
+                ((a.check_date ?? fallbackDate(a)).getTime() -
+                    (b.check_date ?? fallbackDate(b)).getTime());
         case SortType.RESET_DATE:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
+            return (a: Task, b: Task) =>
                 (reverse ? -1 : 1) *
-                            (taskNextReset(a) ?? a.created_at).getTime() -
-                        (taskNextReset(b) ?? b.created_at).getTime(),
-                );
+                ((taskSortReset(a) ?? fallbackDate(a)).getTime() -
+                    (taskSortReset(b) ?? fallbackDate(b)).getTime());
         case SortType.NAME:
-            return tasks
-                .slice()
-                .sort(
-                    (a: Task, b: Task) =>
-                        (reverse ? -1 : 1) * a.name.localeCompare(b.name),
-                );
-        default:
-            return tasks.slice();
+            return (a: Task, b: Task) =>
+                (reverse ? -1 : 1) * a.name.localeCompare(b.name);
     }
 }

resources/ts/views/HomeView.vue

@@ -2,11 +2,9 @@
 import { useListStore } from "@/stores/lists";
 import { ArrowBigRightDashIcon, DicesIcon, HistoryIcon } from "@lucide/vue";
 import { generateSlug } from "random-word-slugs";
-import { defineAsyncComponent, onBeforeMount, ref } from "vue";
+import { onBeforeMount, ref } from "vue";
 import { onBeforeRouteUpdate } from "vue-router";
-const RecentItem = defineAsyncComponent(
-    () => import("@/components/RecentItem.vue"),
-);
+import RecentItem from "@/components/RecentItem.vue";
 
 const listNameInput = ref<string>(generateSlug(4));
 

resources/ts/views/ListView.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, onBeforeMount, computed, defineAsyncComponent } from "vue";
+import { ref, onBeforeMount, computed } from "vue";
 import type { Task } from "@/types";
 import { getTasks, createTask, deleteTask } from "@/api/tasks";
 import {
@@ -9,13 +9,9 @@ import {
     SearchIcon,
     Share2Icon,
 } from "@lucide/vue";
-const TaskItem = defineAsyncComponent(
-    () => import("@/components/TaskItem.vue"),
-);
-const ListOptions = defineAsyncComponent(
-    () => import("@/components/ListOptions.vue"),
-);
-import { taskCompleted, sortTasks, newTemporaryTask } from "@/lib/tasks";
+import TaskItem from "@/components/TaskItem.vue";
+import ListOptions from "@/components/ListOptions.vue";
+import { taskCompleted, taskSortFunction, newTemporaryTask } from "@/lib/tasks";
 import { SortType } from "@/enums";
 import { booleanCookieRef, enumCookieRef } from "@/lib/cookies";
 import { useAlertStore } from "@/stores/alerts";
@@ -79,7 +75,7 @@ function fetchTasks(requestedList: string) {
 }
 
 function reSortTasks(update = false) {
-    tasks.value = sortTasks(tasks.value, sortType.value, sortReverse.value);
+    tasks.value.sort(taskSortFunction(sortType.value, sortReverse.value));
     if (update) {
         updateTitle();
         if (tasks.value.length && list.value) {

uv.lock

@@ -323,7 +323,7 @@ asyncpg = [
 
 [[package]]
 name = "tout-doux"
-version = "1.7.2"
+version = "1.7.6"
 source = { editable = "." }
 dependencies = [
     { name = "flask", extra = ["async"] },