@actual-app/api 26.1.0-nightly.20251217 → 26.1.0-nightly.20251219

package/dist/app/bundle.api.js

@@ -16,6 +16,7 @@ const fs$1 = require("fs");
 const path = require("path");
 const SQL = require("better-sqlite3");
 const node_crypto = require("node:crypto");
+const os = require("os");
 const crypto = require("crypto");
 const require$$0 = require("zlib");
 const require$$0$1 = require("util");
@@ -5840,7 +5841,7 @@ function startOfISOWeekYear(date, options) {
 function addWeeks$1(date, amount, options) {
     return addDays$1(date, amount * 7, options);
 }
-function addYears$1(date, amount, options) {
+function addYears(date, amount, options) {
     return addMonths$1(date, amount * 12, options);
 }
 function max$1(dates, options) {
@@ -9176,7 +9177,7 @@ function subWeeks$1(date, amount, options) {
     return addWeeks$1(date, -amount, options);
 }
 function subYears(date, amount, options) {
-    return addYears$1(date, -amount, options);
+    return addYears(date, -amount, options);
 }
 function last$1(arr) {
     return arr[arr.length - 1];
@@ -11822,7 +11823,6 @@ function isDevelopmentEnvironment() {
 function isNonProductionEnvironment() {
     return isPreviewEnvironment() || isDevelopmentEnvironment();
 }
-const os = require("os");
 os.platform() === "win32";
 os.platform() === "darwin";
 os.platform() === "linux";
@@ -11884,9 +11884,6 @@ function nextMonth(month) {
 function prevMonth(month) {
     return format$2(subMonths$1(_parse(month), 1), "yyyy-MM");
 }
-function addYears(year, n) {
-    return format$2(addYears$1(_parse(year), n), "yyyy");
-}
 function addMonths(month, n) {
     return format$2(addMonths$1(_parse(month), n), "yyyy-MM");
 }
@@ -59611,7 +59608,7 @@ async function upload() {
                 ...uploadMeta ? { "X-ACTUAL-ENCRYPT-META": JSON.stringify(uploadMeta) } : null,
                 ...groupId ? { "X-ACTUAL-GROUP-ID": groupId } : null
                 // TODO: fix me
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                // oxlint-disable-next-line typescript/no-explicit-any
             },
             body: uploadContent
         });
@@ -102105,7 +102102,7 @@ function getUpcomingDays(upcomingLength = "7", today = currentDay()) {
                         const future = addMonths(today, value);
                         return differenceInCalendarDays(future, month) + 1;
                     case "year":
-                        const futureYear = addYears(today, value);
+                        const futureYear = addMonths(today, value * 12);
                         return differenceInCalendarDays(futureYear, month) + 1;
                     default:
                         return 7;
@@ -106539,7 +106536,7 @@ function registerHandlebarsHelpers() {
         addYears: (date, years) => {
             if (!date || !years)
                 return date;
-            return format$1(addYears$1(parseDate$1(date), years), "yyyy-MM-dd");
+            return format$1(addYears(parseDate$1(date), years), "yyyy-MM-dd");
         },
         subYears: (date, years) => {
             if (!date || !years)
@@ -121805,7 +121802,15 @@ const DEFAULT_DASHBOARD_STATE = [
                 start: "2024-01-01",
                 end: "2024-03-31",
                 mode: "sliding-window"
-            }
+            },
+            conditions: [
+                {
+                    field: "transfer",
+                    op: "is",
+                    value: false
+                }
+            ],
+            conditionsOp: "and"
         }
     },
     {
@@ -133932,17 +133937,60 @@ async function mergeTransactions(transactions) {
         throw new Error("Transaction amounts must match for merge");
     }
     const { keep, drop: drop2 } = determineKeepDrop(a, b);
-    await Promise.all([
-        updateTransaction$2({
+    const keepSubtransactions = [];
+    const dropSubtransactions = [];
+    const parents = [];
+    if (keep.is_parent)
+        parents.push(keep.id);
+    if (drop2.is_parent)
+        parents.push(drop2.id);
+    let rows = [];
+    if (parents.length === 2) {
+        rows = await all("SELECT * FROM v_transactions WHERE parent_id IN (?, ?)", parents);
+    }
+    else if (parents.length === 1) {
+        rows = await all("SELECT * FROM v_transactions WHERE parent_id = ?", parents);
+    }
+    for (const row of rows) {
+        if (row.parent_id === keep.id)
+            keepSubtransactions.push(row);
+        else if (row.parent_id === drop2.id)
+            dropSubtransactions.push(row);
+    }
+    const keepHasSubtransactions = keepSubtransactions.length > 0;
+    const dropHasSubtransactions = dropSubtransactions.length > 0;
+    if (!keepHasSubtransactions && dropHasSubtransactions) {
+        await Promise.all(dropSubtransactions.map((sub2) => updateTransaction$2({
+            id: sub2.id,
+            parent_id: keep.id
+        })));
+        await updateTransaction$2({
+            id: keep.id,
+            is_parent: true,
+            category: null,
+            // Parent transactions with splits shouldn't have a category
+            payee: keep.payee || drop2.payee,
+            notes: keep.notes || drop2.notes,
+            cleared: keep.cleared || drop2.cleared,
+            reconciled: keep.reconciled || drop2.reconciled
+        });
+    }
+    else {
+        await updateTransaction$2({
             id: keep.id,
             payee: keep.payee || drop2.payee,
             category: keep.category || drop2.category,
             notes: keep.notes || drop2.notes,
             cleared: keep.cleared || drop2.cleared,
             reconciled: keep.reconciled || drop2.reconciled
-        }),
-        deleteTransaction$2(drop2)
-    ]);
+        });
+    }
+    const { data: transactionsToDelete } = await aqlQuery(q("transactions").filter({ id: drop2.id }).select("*").options({ splits: "grouped" }));
+    const ungroupedTransactions = ungroupTransactions(transactionsToDelete);
+    if (ungroupedTransactions.length > 0) {
+        const { diff: diff2 } = deleteTransaction$1(ungroupedTransactions, drop2.id);
+        await batchUpdateTransactions(diff2);
+    }
     return keep.id;
 }
 function determineKeepDrop(a, b) {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@actual-app/api",
-    "version": "26.1.0-nightly.20251217",
+    "version": "26.1.0-nightly.20251219",
     "license": "MIT",
     "description": "An API for Actual",
     "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "26.1.0-nightly.20251217",
+  "version": "26.1.0-nightly.20251219",
   "license": "MIT",
   "description": "An API for Actual",
   "engines": {