@actual-app/api 26.3.0 → 26.4.0-nightly.20260305

package/dist/app/bundle.api.js

@@ -119,13 +119,13 @@ const db$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty
         return getAccount;
     },
     get getAccounts() {
-        return getAccounts$2;
+        return getAccounts$1;
     },
     get getAllTags() {
         return getAllTags;
     },
     get getCategories() {
-        return getCategories$3;
+        return getCategories$2;
     },
     get getCategoriesGrouped() {
         return getCategoriesGrouped;
@@ -152,7 +152,7 @@ const db$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty
         return getPayeeByName;
     },
     get getPayees() {
-        return getPayees$2;
+        return getPayees$1;
     },
     get getTags() {
         return getTags$1;
@@ -3515,10 +3515,6 @@ if (typeof global !== "undefined") {
         global.require = globalThis.require;
     }
 }
-let send$2;
-function override(sendImplementation) {
-    send$2 = sendImplementation;
-}
 var errCode;
 var hasRequiredErrCode;
 function requireErrCode() {
@@ -6563,6 +6559,9 @@ function isAfter$1(date, dateToCompare) {
 function isBefore$1(date, dateToCompare) {
     return +toDate(date) < +toDate(dateToCompare);
 }
+function isFriday(date, options) {
+    return toDate(date, options?.in).getDay() === 5;
+}
 function transpose(date, constructor) {
     const date_ = isConstructor(constructor) ? new constructor(0) : constructFrom(constructor, 0);
     date_.setFullYear(date.getFullYear(), date.getMonth(), date.getDate());
@@ -15787,7 +15786,7 @@ async function execCategoryGroupsWithCategories(compilerState, queryState, sqlPi
     if (categoriesOption === "none") {
         return categoryGroups;
     }
-    const { data: categories } = await aqlQuery$1(q("categories").filter({
+    const { data: categories } = await aqlQuery(q("categories").filter({
         group: { $oneof: categoryGroups.map((cg) => cg.id) }
     }).select("*"));
     return categoryGroups.map((group) => {
@@ -15856,7 +15855,7 @@ function aqlCompiledQuery(queryState, sqlPieces, compilerState, params) {
         executors: schemaExecutors
     });
 }
-function aqlQuery$1(query, params) {
+function aqlQuery(query, params) {
     if (query instanceof Query) {
         query = query.serialize();
     }
@@ -16593,6 +16592,7 @@ const currencies = [
     { code: "SGD", name: "Singapore Dollar", symbol: "S$", decimalPlaces: 2, numberFormat: "comma-dot", symbolFirst: true },
     { code: "THB", name: "Thai Baht", symbol: "฿", decimalPlaces: 2, numberFormat: "comma-dot", symbolFirst: true },
     { code: "TRY", name: "Turkish Lira", symbol: "₺", decimalPlaces: 2, numberFormat: "dot-comma", symbolFirst: true },
+    { code: "TWD", name: "New Taiwan Dollar", symbol: "NT$", decimalPlaces: 2, numberFormat: "comma-dot", symbolFirst: true },
     { code: "UAH", name: "Ukrainian Hryvnia", symbol: "₴", decimalPlaces: 2, numberFormat: "space-comma", symbolFirst: false },
     { code: "USD", name: "US Dollar", symbol: "$", decimalPlaces: 2, numberFormat: "comma-dot", symbolFirst: true },
     { code: "UZS", name: "Uzbek Soum", symbol: "UZS", decimalPlaces: 2, numberFormat: "space-comma", symbolFirst: false }
@@ -56232,7 +56232,7 @@ async function addMovementNotes({ month, amount, to, from, currencyCode }) {
     const existingMonthBudgetNotes = addNewLine(firstSync(`SELECT n.note FROM notes n WHERE n.id = ?`, [monthBudgetNotesId])?.note);
     const locale = getLocale(await getItem("language"));
     const displayDay = format$1(currentDate(), "MMMM dd", locale);
-    const categories = await getCategories$3([from, to].filter((c) => c !== "to-budget" && c !== "overbudgeted"));
+    const categories = await getCategories$2([from, to].filter((c) => c !== "to-budget" && c !== "overbudgeted"));
     const fromCategoryName = from === "to-budget" ? "To Budget" : categories.find((c) => c.id === from)?.name;
     const toCategoryName = to === "to-budget" ? "To Budget" : to === "overbudgeted" ? "Overbudgeted" : categories.find((c) => c.id === to)?.name;
     const note = `Reassigned ${displayAmount} from ${fromCategoryName} → ${toCategoryName} on ${displayDay}`;
@@ -56296,7 +56296,7 @@ function createBlankMonth(categories, sheetName, months) {
     get$3().createStatic(sheetName, "buffered", 0);
     categories.forEach((cat) => createBlankCategory(cat, months));
 }
-function createCategory$4(cat, sheetName, prevSheetName) {
+function createCategory$3(cat, sheetName, prevSheetName) {
     if (!cat.is_income) {
         get$3().createStatic(sheetName, `budget-${cat.id}`, 0);
         if (get$3().getCellValue(sheetName, `budget-${cat.id}`) == null) {
@@ -56325,7 +56325,7 @@ function createCategory$4(cat, sheetName, prevSheetName) {
         });
     }
 }
-function createCategoryGroup$3(group, sheetName) {
+function createCategoryGroup$2(group, sheetName) {
     get$3().createDynamic(sheetName, "group-sum-amount-" + group.id, {
         initialValue: 0,
         dependencies: group.categories.map((cat) => `sum-amount-${cat.id}`),
@@ -56486,7 +56486,7 @@ function handleCategoryChange$1(months, oldValue, newValue) {
             const prevSheetName = sheetForMonth(prevMonth$1);
             const sheetName = sheetForMonth(month);
             const { start, end } = bounds(month);
-            createCategory$2(newValue, sheetName, prevSheetName, start, end);
+            createCategory$1(newValue, sheetName, prevSheetName, start, end);
             const id2 = newValue.id;
             const groupId = newValue.cat_group;
             get$3().addDependencies(sheetName, "last-month-overspent", [
@@ -56547,13 +56547,13 @@ function handleCategoryGroupChange$1(months, oldValue, newValue) {
             months.forEach((month) => {
                 const sheetName = sheetForMonth(month);
                 const categories = runQuery("SELECT * FROM categories WHERE tombstone = 0 AND cat_group = ?", [group.id], true);
-                createCategoryGroup$3({ ...group, categories }, sheetName);
+                createCategoryGroup$2({ ...group, categories }, sheetName);
                 addDeps(sheetName, group.id);
             });
         }
     }
 }
-async function createCategory$3(cat, sheetName, prevSheetName) {
+async function createCategory$2(cat, sheetName, prevSheetName) {
     get$3().createStatic(sheetName, `budget-${cat.id}`, 0);
     if (get$3().getCellValue(sheetName, `budget-${cat.id}`) == null) {
         get$3().set(resolveName(sheetName, `budget-${cat.id}`), 0);
@@ -56588,7 +56588,7 @@ async function createCategory$3(cat, sheetName, prevSheetName) {
     });
     get$3().createStatic(sheetName, `carryover-${cat.id}`, false);
 }
-function createCategoryGroup$2(group, sheetName) {
+function createCategoryGroup$1(group, sheetName) {
     get$3().createDynamic(sheetName, "group-sum-amount-" + group.id, {
         initialValue: 0,
         dependencies: group.categories.filter((cat) => !cat.hidden).map((cat) => `sum-amount-${cat.id}`),
@@ -56686,7 +56686,7 @@ function handleCategoryChange(months, oldValue, newValue) {
             const prevSheetName = sheetForMonth(prevMonth$1);
             const sheetName = sheetForMonth(month);
             const { start, end } = bounds(month);
-            createCategory$2(newValue, sheetName, prevSheetName, start, end);
+            createCategory$1(newValue, sheetName, prevSheetName, start, end);
             const id2 = newValue.id;
             const groupId = newValue.cat_group;
             addDeps(sheetName, groupId, id2);
@@ -56749,7 +56749,7 @@ function handleCategoryGroupChange(months, oldValue, newValue) {
         months.forEach((month) => {
             const sheetName = sheetForMonth(month);
             const categories = runQuery("SELECT * FROM categories WHERE tombstone = 0 AND cat_group = ?", [group.id], true);
-            createCategoryGroup$2({ ...group, categories }, sheetName);
+            createCategoryGroup$1({ ...group, categories }, sheetName);
             addDeps(sheetName, group.id);
         });
     }
@@ -56780,7 +56780,7 @@ function getBudgetRange(start, end) {
     end = addMonths(end, 12);
     return { start, end, range: rangeInclusive(start, end) };
 }
-function createCategory$2(cat, sheetName, prevSheetName, start, end) {
+function createCategory$1(cat, sheetName, prevSheetName, start, end) {
     get$3().createDynamic(sheetName, "sum-amount-" + cat.id, {
         initialValue: 0,
         run: () => {
@@ -56794,10 +56794,10 @@ function createCategory$2(cat, sheetName, prevSheetName, start, end) {
         }
     });
     if (getBudgetType() === "envelope") {
-        createCategory$4(cat, sheetName, prevSheetName);
+        createCategory$3(cat, sheetName, prevSheetName);
     }
     else {
-        void createCategory$3(cat, sheetName, prevSheetName);
+        void createCategory$2(cat, sheetName, prevSheetName);
     }
 }
 function handleAccountChange(months, oldValue, newValue) {
@@ -56912,7 +56912,7 @@ async function doTransfer(categoryIds, transferId) {
     });
 }
 async function createBudget$2(months) {
-    const { data: groups } = await aqlQuery$1(q("category_groups").select("*"));
+    const { data: groups } = await aqlQuery(q("category_groups").select("*"));
     const categories = groups.flatMap((group) => group.categories);
     startTransaction();
     const meta = get$3().meta();
@@ -56928,14 +56928,14 @@ async function createBudget$2(months) {
             const sheetName = sheetForMonth(month);
             const prevSheetName = sheetForMonth(prevMonth$1);
             categories.forEach((cat) => {
-                createCategory$2(cat, sheetName, prevSheetName, start, end);
+                createCategory$1(cat, sheetName, prevSheetName, start, end);
             });
             groups.forEach((group) => {
                 if (budgetType === "envelope") {
-                    createCategoryGroup$3(group, sheetName);
+                    createCategoryGroup$2(group, sheetName);
                 }
                 else {
-                    createCategoryGroup$2(group, sheetName);
+                    createCategoryGroup$1(group, sheetName);
                 }
             });
             if (budgetType === "envelope") {
@@ -56986,9 +56986,6 @@ async function setType(type2) {
     get$3().endCacheBarrier();
     return bounds2;
 }
-const app$j = createApp();
-app$j.events.on("sync", (event) => {
-});
 const runningMethods = /* @__PURE__ */ new Set();
 let currentContext = null;
 const mutatingMethods = /* @__PURE__ */ new WeakMap();
@@ -57054,6 +57051,12 @@ function getMutatorContext() {
     }
     return currentContext;
 }
+const app$j = createApp();
+app$j.events.on("sync", (event) => {
+});
+async function send(name, args) {
+    return runHandler(app$j.handlers[name], args, { name });
+}
 const fetch$1 = globalThis.fetch;
 function throwIfNot200(res, text) {
     if (res.status !== 200) {
@@ -61602,7 +61605,7 @@ function insertWithSchema(table, row) {
 function updateWithSchema(table, fields) {
     return update(table, convertForUpdate(schema, schemaConfig, table, fields));
 }
-async function getCategories$3(ids) {
+async function getCategories$2(ids) {
     const whereIn2 = ids ? `c.id IN (${toSqlQueryParameters(ids)}) AND` : "";
     const query = `SELECT c.* FROM categories c WHERE ${whereIn2} c.tombstone = 0 ORDER BY c.sort_order, c.id`;
     return ids ? await all(query, [...ids]) : await all(query);
@@ -61768,7 +61771,7 @@ async function mergePayees$1(target, ids) {
         ])));
     });
 }
-function getPayees$2() {
+function getPayees$1() {
     return all(`
     SELECT p.*, COALESCE(a.name, p.name) AS name FROM payees p
     LEFT JOIN accounts a ON (p.transfer_acct = a.id AND a.tombstone = 0)
@@ -61822,7 +61825,7 @@ async function getOrphanedPayees$1() {
 async function getPayeeByName(name) {
     return first$2(`SELECT * FROM payees WHERE UNICODE_LOWER(name) = ? AND tombstone = 0`, [name.toLowerCase()]);
 }
-function getAccounts$2() {
+function getAccounts$1() {
     return all(`SELECT a.*, b.name as bankName, b.id as bankId FROM accounts a
        LEFT JOIN banks b ON a.bank = b.id
        WHERE a.tombstone = 0
@@ -61924,7 +61927,7 @@ async function findOrCreateBank(institution, requisitionId) {
     await insertWithUUID("banks", bankData);
     return bankData;
 }
-async function createPayee$2(description) {
+async function createPayee$1(description) {
     const row = await first$2(`SELECT id FROM payees WHERE UNICODE_LOWER(name) = ? AND tombstone = 0`, [description.toLowerCase()]);
     if (row) {
         return row.id;
@@ -61943,7 +61946,7 @@ async function getStartingBalancePayee() {
     if (category === null) {
         category = await first$2("SELECT * FROM categories WHERE is_income = 1 AND tombstone = 0");
     }
-    const id2 = await createPayee$2("Starting Balance");
+    const id2 = await createPayee$1("Starting Balance");
     return {
         id: id2,
         category: category ? category.id : null
@@ -103852,7 +103855,6 @@ function getHasTransactionsQuery(schedules) {
 function recurConfigToRSchedule(config2) {
     const base = {
         start: parseDate$1(config2.start),
-        // @ts-expect-error: issues with https://gitlab.com/john.carroll.p/rschedule/-/issues/86
         frequency: config2.frequency.toUpperCase(),
         byHourOfDay: [12]
     };
@@ -108740,7 +108742,7 @@ async function insertRule(rule) {
     rule = ruleModel.validate(rule);
     return insertWithUUID("rules", ruleModel.fromJS(rule));
 }
-async function updateRule$2(rule) {
+async function updateRule$1(rule) {
     rule = ruleModel.validate(rule, { update: true });
     return update("rules", ruleModel.fromJS(rule));
 }
@@ -108799,7 +108801,7 @@ async function getAllRuleIdsFromSchedules(excluding) {
 async function runRules$1(trans, accounts = null) {
     let accountsMap = null;
     if (accounts === null) {
-        accountsMap = new Map((await getAccounts$2()).map((account) => [account.id, account]));
+        accountsMap = new Map((await getAccounts$1()).map((account) => [account.id, account]));
     }
     else {
         accountsMap = accounts;
@@ -109092,7 +109094,7 @@ async function applyActions(transactions, actions) {
     if (parsedActions.length !== actions.length) {
         return null;
     }
-    const accounts = await getAccounts$2();
+    const accounts = await getAccounts$1();
     const accountsMap = new Map(accounts.map((account) => [account.id, account]));
     const transactionsForRules = await Promise.all(transactions.map((transactions2) => prepareTransactionForRules(transactions2, accountsMap)));
     const updated = transactionsForRules.flatMap((trans) => {
@@ -109146,7 +109148,7 @@ async function updatePayeeRenameRule(fromNames, to) {
             ...renameRule,
             conditions: [{ ...condition, value: newValue }]
         };
-        await updateRule$2(rule);
+        await updateRule$1(rule);
         return renameRule.id;
     }
     else {
@@ -109217,7 +109219,7 @@ async function updateCategoryRules(transactions) {
                 for (const rule of ruleSetters) {
                     const action = rule.actions[0];
                     if (action.value !== category) {
-                        await updateRule$2({
+                        await updateRule$1({
                             ...rule,
                             actions: [{ ...action, value: category }]
                         });
@@ -109277,7 +109279,7 @@ async function prepareTransactionForRules(trans, accounts = null) {
                 }
             ]
         };
-        const { data: balance } = await aqlQuery$1(query.filter({ $or: [{ date: { $lt: dateBoundary } }, sameDayFilter] }).calculate({ $sum: "$amount" }));
+        const { data: balance } = await aqlQuery(query.filter({ $or: [{ date: { $lt: dateBoundary } }, sameDayFilter] }).calculate({ $sum: "$amount" }));
         r.balance = balance ?? 0;
     }
     if (trans.category) {
@@ -109728,7 +109730,7 @@ async function updateAccountBalance(id2, balance) {
     ]);
 }
 async function getAccountOldestTransaction(id2) {
-    return (await aqlQuery$1(q("transactions").filter({
+    return (await aqlQuery(q("transactions").filter({
         account: id2,
         date: { $lte: currentDay() }
     }).select("date").orderBy("date").limit(1))).data?.[0];
@@ -109911,9 +109913,9 @@ async function normalizeTransactions(transactions, acctId, { rawPayeeName = fals
 async function normalizeBankSyncTransactions(transactions, acctId) {
     const payeesToCreate = /* @__PURE__ */ new Map();
     const [customMappingsRaw, importPending, importNotes] = await Promise.all([
-        aqlQuery$1(q("preferences").filter({ id: `custom-sync-mappings-${acctId}` }).select("value")).then((data) => data?.data?.[0]?.value),
-        aqlQuery$1(q("preferences").filter({ id: `sync-import-pending-${acctId}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "true") === "true"),
-        aqlQuery$1(q("preferences").filter({ id: `sync-import-notes-${acctId}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "true") === "true")
+        aqlQuery(q("preferences").filter({ id: `custom-sync-mappings-${acctId}` }).select("value")).then((data) => data?.data?.[0]?.value),
+        aqlQuery(q("preferences").filter({ id: `sync-import-pending-${acctId}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "true") === "true"),
+        aqlQuery(q("preferences").filter({ id: `sync-import-notes-${acctId}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "true") === "true")
     ]);
     const mappings = customMappingsRaw ? mappingsFromString(customMappingsRaw) : defaultMappings;
     const normalized = [];
@@ -110086,11 +110088,11 @@ async function reconcileTransactions(acctId, transactions, isBankSyncAccount = f
 }
 async function matchTransactions(acctId, transactions, isBankSyncAccount = false, strictIdChecking = true) {
     logger.log("Performing transaction reconciliation matching");
-    const reimportDeleted = await aqlQuery$1(q("preferences").filter({ id: `sync-reimport-deleted-${acctId}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "true") === "true");
+    const reimportDeleted = await aqlQuery(q("preferences").filter({ id: `sync-reimport-deleted-${acctId}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "true") === "true");
     const hasMatched = /* @__PURE__ */ new Set();
     const transactionNormalization = isBankSyncAccount ? normalizeBankSyncTransactions : normalizeTransactions;
     const { normalized, payeesToCreate } = await transactionNormalization(transactions, acctId);
-    const accounts = await getAccounts$2();
+    const accounts = await getAccounts$1();
     const accountsMap = new Map(accounts.map((account) => [account.id, account]));
     const transactionsStep1 = [];
     for (const { payee_name, trans: originalTrans, subtransactions } of normalized) {
@@ -110168,10 +110170,10 @@ async function matchTransactions(acctId, transactions, isBankSyncAccount = false
         transactionsStep3
     };
 }
-async function addTransactions$1(acctId, transactions, { runTransfers = true, learnCategories = false } = {}) {
+async function addTransactions(acctId, transactions, { runTransfers = true, learnCategories = false } = {}) {
     const added = [];
     const { normalized, payeesToCreate } = await normalizeTransactions(transactions, acctId, { rawPayeeName: true });
-    const accounts = await getAccounts$2();
+    const accounts = await getAccounts$1();
     const accountsMap = new Map(accounts.map((account) => [account.id, account]));
     for (const { trans: originalTrans, subtransactions } of normalized) {
         const trans = await runRules$1(originalTrans, accountsMap);
@@ -110208,8 +110210,8 @@ async function addTransactions$1(acctId, transactions, { runTransfers = true, le
 }
 async function processBankSyncDownload(download2, id2, acctRow, initialSync = false, customStartingBalance, customStartingDate) {
     const useStrictIdChecking = !acctRow.account_sync_source;
-    const importTransactions2 = await aqlQuery$1(q("preferences").filter({ id: `sync-import-transactions-${id2}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "true") === "true");
-    const updateDates = await aqlQuery$1(q("preferences").filter({ id: `sync-update-dates-${id2}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "false") === "true");
+    const importTransactions2 = await aqlQuery(q("preferences").filter({ id: `sync-import-transactions-${id2}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "true") === "true");
+    const updateDates = await aqlQuery(q("preferences").filter({ id: `sync-update-dates-${id2}` }).select("value")).then((data) => String(data?.data?.[0]?.value ?? "false") === "true");
     const { transactions: originalTransactions, startingBalance: currentBalance } = download2;
     if (initialSync) {
         const { transactions: transactions2 } = download2;
@@ -110321,8 +110323,8 @@ async function updateAccount({ id: id2, name, last_reconciled }) {
     });
     return {};
 }
-async function getAccounts$1() {
-    const dbAccounts = await getAccounts$2();
+async function getAccounts() {
+    const dbAccounts = await getAccounts$1();
     return dbAccounts.map((dbAccount) => ({
         id: dbAccount.id,
         name: dbAccount.name,
@@ -110468,7 +110470,7 @@ async function linkPluggyAiAccount({ externalAccount, upgradingId, offBudget = f
     await syncAccount(void 0, void 0, id2, externalAccount.account_id, bank.bank_id, startingDate, startingBalance);
     return "ok";
 }
-async function createAccount$1({ name, balance = 0, offBudget = false, closed = false }) {
+async function createAccount({ name, balance = 0, offBudget = false, closed = false }) {
     const id2 = await insertAccount({
         name,
         offbudget: offBudget ? 1 : 0,
@@ -111002,13 +111004,13 @@ async function unlinkAccount({ id: id2 }) {
 }
 const app$i = createApp();
 app$i.method("account-update", mutator(undoable(updateAccount)));
-app$i.method("accounts-get", getAccounts$1);
+app$i.method("accounts-get", getAccounts);
 app$i.method("account-balance", getAccountBalance);
 app$i.method("account-properties", getAccountProperties);
 app$i.method("gocardless-accounts-link", linkGoCardlessAccount);
 app$i.method("simplefin-accounts-link", linkSimpleFinAccount);
 app$i.method("pluggyai-accounts-link", linkPluggyAiAccount);
-app$i.method("account-create", mutator(undoable(createAccount$1)));
+app$i.method("account-create", mutator(undoable(createAccount)));
 app$i.method("account-close", mutator(closeAccount));
 app$i.method("account-reopen", mutator(undoable(reopenAccount)));
 app$i.method("account-move", mutator(undoable(moveAccount)));
@@ -111593,7 +111595,7 @@ handlers["api/abort-import"] = async function () {
 };
 handlers["api/query"] = async function ({ query }) {
     checkFileOpen();
-    return aqlQuery$1(query);
+    return aqlQuery(query);
 };
 handlers["api/budget-months"] = async function () {
     checkFileOpen();
@@ -111603,7 +111605,7 @@ handlers["api/budget-months"] = async function () {
 handlers["api/budget-month"] = async function ({ month }) {
     checkFileOpen();
     await validateMonth(month);
-    const { data: groups } = await aqlQuery$1(q("category_groups").select("*"));
+    const { data: groups } = await aqlQuery(q("category_groups").select("*"));
     const sheetName = sheetForMonth(month);
     function value(name) {
         const v = get$3().getCellValue(sheetName, name);
@@ -111701,7 +111703,7 @@ handlers["api/transactions-import"] = withMutation(async function ({ accountId,
 });
 handlers["api/transactions-add"] = withMutation(async function ({ accountId, transactions, runTransfers = false, learnCategories = false }) {
     checkFileOpen();
-    await addTransactions$1(accountId, transactions, {
+    await addTransactions(accountId, transactions, {
         runTransfers,
         learnCategories
     });
@@ -111709,7 +111711,7 @@ handlers["api/transactions-add"] = withMutation(async function ({ accountId, tra
 });
 handlers["api/transactions-get"] = async function ({ accountId, startDate, endDate }) {
     checkFileOpen();
-    const { data } = await aqlQuery$1(q("transactions").filter({
+    const { data } = await aqlQuery(q("transactions").filter({
         $and: [
             accountId && { account: accountId },
             startDate && { date: { $gte: startDate } },
@@ -111720,7 +111722,7 @@ handlers["api/transactions-get"] = async function ({ accountId, startDate, endDa
 };
 handlers["api/transaction-update"] = withMutation(async function ({ id: id2, fields }) {
     checkFileOpen();
-    const { data } = await aqlQuery$1(q("transactions").filter({ id: id2 }).select("*").options({ splits: "grouped" }));
+    const { data } = await aqlQuery(q("transactions").filter({ id: id2 }).select("*").options({ splits: "grouped" }));
     const transactions = ungroupTransactions(data);
     if (transactions.length === 0) {
         return [];
@@ -111730,7 +111732,7 @@ handlers["api/transaction-update"] = withMutation(async function ({ id: id2, fie
 });
 handlers["api/transaction-delete"] = withMutation(async function ({ id: id2 }) {
     checkFileOpen();
-    const { data } = await aqlQuery$1(q("transactions").filter({ id: id2 }).select("*").options({ splits: "grouped" }));
+    const { data } = await aqlQuery(q("transactions").filter({ id: id2 }).select("*").options({ splits: "grouped" }));
     const transactions = ungroupTransactions(data);
     if (transactions.length === 0) {
         return [];
@@ -111912,7 +111914,7 @@ handlers["api/rule-delete"] = withMutation(async function (id2) {
 });
 handlers["api/schedules-get"] = async function () {
     checkFileOpen();
-    const { data } = await aqlQuery$1(q("schedules").select("*"));
+    const { data } = await aqlQuery(q("schedules").select("*"));
     const schedules = data;
     return schedules.map((schedule) => scheduleModel.toExternal(schedule));
 };
@@ -111930,7 +111932,7 @@ handlers["api/schedule-create"] = withMutation(async function (schedule) {
 });
 handlers["api/schedule-update"] = withMutation(async function ({ id: id2, fields, resetNextDate }) {
     checkFileOpen();
-    const { data } = await aqlQuery$1(q("schedules").filter({ id: id2 }).select("*"));
+    const { data } = await aqlQuery(q("schedules").filter({ id: id2 }).select("*"));
     if (!data || data.length === 0) {
         throw APIError(`Schedule ${id2} not found`);
     }
@@ -111946,7 +111948,7 @@ handlers["api/schedule-update"] = withMutation(async function ({ id: id2, fields
         switch (typedKey) {
             case "name": {
                 const newName = String(value);
-                const { data: existing } = await aqlQuery$1(q("schedules").filter({ name: newName }).select("*"));
+                const { data: existing } = await aqlQuery(q("schedules").filter({ name: newName }).select("*"));
                 if (!existing || existing.length === 0 || existing[0].id === sched.id) {
                     sched.name = newName;
                     conditionsUpdated = true;
@@ -112069,7 +112071,7 @@ handlers["api/get-id-by-name"] = async function ({ type: type2, name }) {
     if (!allowedTypes.includes(type2)) {
         throw APIError("Provide a valid type");
     }
-    const { data } = await aqlQuery$1(q(type2).filter({ name }).select("*"));
+    const { data } = await aqlQuery(q(type2).filter({ name }).select("*"));
     if (!data || data.length === 0) {
         throw APIError(`Not found: ${type2} with name ${name}`);
     }
@@ -117229,7 +117231,7 @@ function takeDates(config2) {
     return schedule.occurrences({ take: 3 }).toArray().map((d2) => d2.date);
 }
 async function getTransactions(date, account) {
-    const { data } = await aqlQuery$1(q("transactions").filter({
+    const { data } = await aqlQuery(q("transactions").filter({
         account,
         schedule: null,
         // Don't match transfers
@@ -117385,7 +117387,7 @@ async function findStartDate(schedule) {
             currentConfig = null;
             break;
         }
-        const { data } = await aqlQuery$1(q("transactions").filter({ $and: filters }).select("*"));
+        const { data } = await aqlQuery(q("transactions").filter({ $and: filters }).select("*"));
         if (data.length === 0) {
             currentConfig = prevConfig;
             break;
@@ -117401,7 +117403,7 @@ async function findStartDate(schedule) {
     return schedule;
 }
 async function findSchedules() {
-    const { data: accounts } = await aqlQuery$1(q("accounts").filter({ closed: false }).select("*"));
+    const { data: accounts } = await aqlQuery(q("accounts").filter({ closed: false }).select("*"));
     let allSchedules = [];
     for (const account of accounts) {
         const latestTrans = await first$2("SELECT date FROM v_transactions WHERE account = ? AND parent_id IS NULL ORDER BY date DESC LIMIT 1", [account.id]);
@@ -117463,11 +117465,11 @@ async function getRuleForSchedule(id2) {
     if (id2 == null) {
         throw new Error("Schedule not attached to a rule");
     }
-    const { data: ruleId } = await aqlQuery$1(q("schedules").filter({ id: id2 }).calculate("rule"));
+    const { data: ruleId } = await aqlQuery(q("schedules").filter({ id: id2 }).calculate("rule"));
     return getRules$1().find((rule) => rule.id === ruleId);
 }
 async function fixRuleForSchedule(id2) {
-    const { data: ruleId } = await aqlQuery$1(q("schedules").filter({ id: id2 }).calculate("rule"));
+    const { data: ruleId } = await aqlQuery(q("schedules").filter({ id: id2 }).calculate("rule"));
     if (ruleId) {
         await delete_("rules", ruleId);
     }
@@ -117483,7 +117485,7 @@ async function fixRuleForSchedule(id2) {
     await updateWithSchema("schedules", { id: id2, rule: newId });
     return getRules$1().find((rule) => rule.id === newId);
 }
-async function setNextDate({ id: id2, start, conditions, reset }) {
+async function setNextDate({ id: id2, start, conditions, reset, skipRequested }) {
     if (conditions == null) {
         const rule = await getRuleForSchedule(id2);
         if (rule == null) {
@@ -117492,7 +117494,17 @@ async function setNextDate({ id: id2, start, conditions, reset }) {
         conditions = rule.serialize().conditions;
     }
     const { date: dateCond } = extractScheduleConds(conditions);
-    const { data: nextDate } = await aqlQuery$1(q("schedules").filter({ id: id2 }).calculate("next_date"));
+    let { data: nextDate } = await aqlQuery(q("schedules").filter({ id: id2 }).calculate("next_date"));
+    if (skipRequested === true) {
+        const skipWeekend = dateCond.value?.skipWeekend;
+        const weekendSolveMode = dateCond.value?.weekendSolveMode;
+        if (weekendSolveMode === "before" && skipWeekend === true) {
+            const parsedNextDate = parseDate$1(nextDate);
+            if (isFriday(parsedNextDate) || isWeekend(parsedNextDate)) {
+                nextDate = dayFromDate(nextMonday(parsedNextDate));
+            }
+        }
+    }
     if (dateCond) {
         const newNextDate = getNextDate(dateCond, start ? start(nextDate) : /* @__PURE__ */ new Date());
         if (newNextDate !== nextDate) {
@@ -117519,7 +117531,7 @@ async function checkIfScheduleExists(name, scheduleId) {
     }
     return true;
 }
-async function createSchedule$1({ schedule = null, conditions = [] } = {}) {
+async function createSchedule({ schedule = null, conditions = [] } = {}) {
     const scheduleId = schedule?.id || v4();
     const { date: dateCond } = extractScheduleConds(conditions);
     if (dateCond == null) {
@@ -117580,7 +117592,7 @@ async function updateSchedule({ schedule, conditions, resetNextDate }) {
         if (conditions) {
             const oldConditions = rule.serialize().conditions;
             const newConditions = updateConditions(oldConditions, conditions);
-            await updateRule$2({ id: rule.id, conditions: newConditions });
+            await updateRule$1({ id: rule.id, conditions: newConditions });
             const stripType = ({ type: _type, ...fields }) => fields;
             if (resetNextDate || !deepEqual(oldConditions.find((c) => c.field === "account"), oldConditions.find((c) => c.field === "account")) || !deepEqual(stripType(oldConditions.find((c) => c.field === "date") || {}), stripType(newConditions.find((c) => c.field === "date") || {}))) {
                 await setNextDate({
@@ -117598,7 +117610,7 @@ async function updateSchedule({ schedule, conditions, resetNextDate }) {
     return schedule.id;
 }
 async function deleteSchedule({ id: id2 }) {
-    const { data: ruleId } = await aqlQuery$1(q("schedules").filter({ id: id2 }).calculate("rule"));
+    const { data: ruleId } = await aqlQuery(q("schedules").filter({ id: id2 }).calculate("rule"));
     await batchMessages(async () => {
         await delete_("rules", ruleId);
         await delete_("schedules", id2);
@@ -117609,7 +117621,8 @@ async function skipNextDate({ id: id2 }) {
         id: id2,
         start: (nextDate) => {
             return addDays$1(parseDate$1(nextDate), 1);
-        }
+        },
+        skipRequested: true
     });
 }
 function discoverSchedules() {
@@ -117664,7 +117677,7 @@ function onApplySync(oldValues, newValues) {
     });
 }
 async function postTransactionForSchedule({ id: id2, today }) {
-    const { data } = await aqlQuery$1(q("schedules").filter({ id: id2 }).select("*"));
+    const { data } = await aqlQuery(q("schedules").filter({ id: id2 }).select("*"));
     const schedule = data[0];
     if (schedule == null || schedule._account == null) {
         return;
@@ -117678,15 +117691,15 @@ async function postTransactionForSchedule({ id: id2, today }) {
         cleared: false
     };
     if (transaction2.account) {
-        await addTransactions$1(transaction2.account, [transaction2]);
+        await addTransactions(transaction2.account, [transaction2]);
     }
 }
 async function advanceSchedulesService(syncSuccess) {
-    const { data: schedules } = await aqlQuery$1(q("schedules").filter({ completed: false, "_account.closed": false }).select("*"));
-    const { data: hasTransData } = await aqlQuery$1(getHasTransactionsQuery(schedules));
+    const { data: schedules } = await aqlQuery(q("schedules").filter({ completed: false, "_account.closed": false }).select("*"));
+    const { data: hasTransData } = await aqlQuery(getHasTransactionsQuery(schedules));
     const hasTrans = new Set(hasTransData.filter(Boolean).map((row) => row.schedule));
     const failedToPost = [];
-    const { data: upcomingLength } = await aqlQuery$1(q("preferences").filter({ id: "upcomingScheduledTransactionLength" }).select("value"));
+    const { data: upcomingLength } = await aqlQuery(q("preferences").filter({ id: "upcomingScheduledTransactionLength" }).select("value"));
     for (const schedule of schedules) {
         const status = getStatus(schedule.next_date, schedule.completed, hasTrans.has(schedule.id), upcomingLength[0]?.value ?? "7");
         if (status === "paid") {
@@ -117718,7 +117731,7 @@ async function advanceSchedulesService(syncSuccess) {
     }
 }
 const app$f = createApp();
-app$f.method("schedule/create", mutator(undoable(createSchedule$1)));
+app$f.method("schedule/create", mutator(undoable(createSchedule)));
 app$f.method("schedule/update", mutator(undoable(updateSchedule)));
 app$f.method("schedule/delete", mutator(undoable(deleteSchedule)));
 app$f.method("schedule/skip-next-date", mutator(undoable(skipNextDate)));
@@ -121032,8 +121045,8 @@ class CategoryTemplateContext {
         }
         await CategoryTemplateContext.checkByAndScheduleAndSpend(templates, month);
         await CategoryTemplateContext.checkPercentage(templates);
-        const hideDecimal = await aqlQuery$1(q("preferences").filter({ id: "hideFraction" }).select("*"));
-        const currencyPref = await aqlQuery$1(q("preferences").filter({ id: "defaultCurrencyCode" }).select("*"));
+        const hideDecimal = await aqlQuery(q("preferences").filter({ id: "hideFraction" }).select("*"));
+        const currencyPref = await aqlQuery(q("preferences").filter({ id: "defaultCurrencyCode" }).select("*"));
         const currencyCode = currencyPref.data.length > 0 ? currencyPref.data[0].value : "";
         return new CategoryTemplateContext(templates, category, month, fromLastMonth, budgeted, currencyCode, hideDecimal.data.length > 0 ? hideDecimal.data[0].value === "true" : false);
     }
@@ -121268,7 +121281,7 @@ class CategoryTemplateContext {
         if (pt2.length === 0)
             return;
         const reqCategories = pt2.map((t2) => t2.category.toLowerCase());
-        const availCategories = await getCategories$3();
+        const availCategories = await getCategories$2();
         const availNames = availCategories.filter((c) => c.is_income).map((c) => c.name.toLocaleLowerCase());
         reqCategories.forEach((n) => {
             if (n === "available funds" || n === "all income")
@@ -121457,7 +121470,7 @@ class CategoryTemplateContext {
             monthlyIncome = availableFunds;
         }
         else {
-            const incomeCat = (await getCategories$3()).find((c) => c.is_income && c.name.toLowerCase() === cat);
+            const incomeCat = (await getCategories$2()).find((c) => c.is_income && c.name.toLowerCase() === cat);
             if (!incomeCat) {
                 throw new Error(`Income category "${template.category}" not found for percentage template`);
             }
@@ -121551,14 +121564,14 @@ async function overwriteTemplate({ month }) {
     return ret;
 }
 async function applyMultipleCategoryTemplates({ month, categoryIds }) {
-    const { data: categoryData } = await aqlQuery$1(q("categories").filter({ id: { $oneof: categoryIds } }).select("*"));
+    const { data: categoryData } = await aqlQuery(q("categories").filter({ id: { $oneof: categoryIds } }).select("*"));
     await storeNoteTemplates();
     const categoryTemplates = await getTemplates((c) => categoryIds.includes(c.id));
     const ret = await processTemplate(month, true, categoryTemplates, categoryData);
     return ret;
 }
 async function applySingleCategoryTemplate({ month, category }) {
-    const { data: categoryData } = await aqlQuery$1(q("categories").filter({ id: category }).select("*"));
+    const { data: categoryData } = await aqlQuery(q("categories").filter({ id: category }).select("*"));
     await storeNoteTemplates();
     const categoryTemplates = await getTemplates((c) => c.id === category);
     const ret = await processTemplate(month, true, categoryTemplates, categoryData);
@@ -121567,12 +121580,12 @@ async function applySingleCategoryTemplate({ month, category }) {
 function runCheckTemplates() {
     return checkTemplateNotes();
 }
-async function getCategories$2() {
-    const { data: categoryGroups } = await aqlQuery$1(q("category_groups").filter({ hidden: false }).select("*"));
+async function getCategories$1() {
+    const { data: categoryGroups } = await aqlQuery(q("category_groups").filter({ hidden: false }).select("*"));
     return categoryGroups.flatMap((g) => g.categories || []).filter((c) => !c.hidden);
 }
 async function getTemplates(filter2 = () => true) {
-    const { data: categoriesWithGoalDef } = await aqlQuery$1(q("categories").filter({ goal_def: { $ne: null } }).select("*"));
+    const { data: categoriesWithGoalDef } = await aqlQuery(q("categories").filter({ goal_def: { $ne: null } }).select("*"));
     const categoryTemplates = {};
     for (const categoryWithGoalDef of categoriesWithGoalDef.filter(filter2)) {
         categoryTemplates[categoryWithGoalDef.id] = JSON.parse(categoryWithGoalDef.goal_def);
@@ -121608,7 +121621,7 @@ async function setGoals(month, templateGoal) {
 async function processTemplate(month, force, categoryTemplates, categories = []) {
     const isReflect = isReflectBudget();
     if (!categories.length) {
-        categories = (await getCategories$2()).filter((c) => isReflect || !c.is_income);
+        categories = (await getCategories$1()).filter((c) => isReflect || !c.is_income);
     }
     const templateContexts = [];
     let availBudget = await getSheetValue(sheetForMonth(month), `to-budget`);
@@ -121722,16 +121735,16 @@ app$e.method("budget/cover-overbudgeted", mutator(undoable(coverOverbudgeted)));
 app$e.method("budget/transfer-category", mutator(undoable(transferCategory)));
 app$e.method("budget/set-carryover", mutator(undoable(setCategoryCarryover)));
 app$e.method("budget/reset-income-carryover", mutator(undoable(resetIncomeCarryover)));
-app$e.method("get-categories", getCategories$1);
+app$e.method("get-categories", getCategories);
 app$e.method("get-budget-bounds", getBudgetBounds);
 app$e.method("envelope-budget-month", envelopeBudgetMonth);
 app$e.method("tracking-budget-month", trackingBudgetMonth);
-app$e.method("category-create", mutator(undoable(createCategory$1)));
+app$e.method("category-create", mutator(undoable(createCategory)));
 app$e.method("category-update", mutator(undoable(updateCategory)));
 app$e.method("category-move", mutator(undoable(moveCategory)));
 app$e.method("category-delete", mutator(undoable(deleteCategory)));
 app$e.method("get-category-groups", getCategoryGroups);
-app$e.method("category-group-create", mutator(undoable(createCategoryGroup$1)));
+app$e.method("category-group-create", mutator(undoable(createCategoryGroup)));
 app$e.method("category-group-update", mutator(undoable(updateCategoryGroup)));
 app$e.method("category-group-move", mutator(undoable(moveCategoryGroup)));
 app$e.method("category-group-delete", mutator(undoable(deleteCategoryGroup)));
@@ -121740,7 +121753,7 @@ app$e.method("budget/get-category-automations", getTemplatesForCategory);
 app$e.method("budget/set-category-automations", mutator(undoable(storeTemplates)));
 app$e.method("budget/store-note-templates", mutator(storeNoteTemplates));
 app$e.method("budget/render-note-templates", unparse);
-async function getCategories$1() {
+async function getCategories() {
     const categoryGroups = await getCategoryGroups();
     return {
         grouped: categoryGroups,
@@ -121834,7 +121847,7 @@ async function trackingBudgetMonth({ month }) {
     }
     return values2;
 }
-async function createCategory$1({ name, groupId, isIncome, hidden }) {
+async function createCategory({ name, groupId, isIncome, hidden }) {
     if (!groupId) {
         throw APIError("Creating a category: groupId is required");
     }
@@ -121886,10 +121899,10 @@ async function deleteCategory({ id: id2, transferId }) {
     });
 }
 async function getCategoryGroups() {
-    const { data: categoryGroups } = await aqlQuery$1(q("category_groups").select("*"));
+    const { data: categoryGroups } = await aqlQuery(q("category_groups").select("*"));
     return categoryGroups;
 }
-async function createCategoryGroup$1({ name, isIncome, hidden }) {
+async function createCategoryGroup({ name, isIncome, hidden }) {
     return await insertCategoryGroup({
         name,
         is_income: isIncome ? 1 : 0,
@@ -122112,7 +122125,7 @@ async function fillPrimaryChecking(handlers2, account, payees, groups) {
         category: getStartingBalanceCat(incomeGroup.categories),
         starting_balance_flag: true
     });
-    return addTransactions$1(account.id, transactions);
+    return addTransactions(account.id, transactions);
 }
 async function fillChecking(handlers2, account, payees, groups) {
     const { incomePayee, expensePayees, incomeGroup, expenseCategories } = extractCommonThings(payees, groups);
@@ -122363,7 +122376,7 @@ async function createBudget$1(accounts, payees, groups) {
     const sheetName = sheetForMonth(currentMonth());
     const toBudget = getCellValue(sheetName, "to-budget");
     if (toBudget < 0) {
-        await addTransactions$1(primaryAccount.id, [
+        await addTransactions(primaryAccount.id, [
             {
                 amount: -toBudget,
                 category: category("Income").id,
@@ -122508,9 +122521,9 @@ async function createTestBudget(handlers2) {
     }));
     setSyncingMode("import");
     const primaryAccount = accounts.find((a3) => a3.name = "Bank of America");
-    const { data: primaryBalance } = await aqlQuery$1(q("transactions").filter({ account: primaryAccount.id }).calculate({ $sum: "$amount" }).serialize());
+    const { data: primaryBalance } = await aqlQuery(q("transactions").filter({ account: primaryAccount.id }).calculate({ $sum: "$amount" }).serialize());
     if (primaryBalance < 0) {
-        const { data: results } = await aqlQuery$1(q("transactions").filter({ account: primaryAccount.id, amount: { $gt: 0 } }).limit(1).select(["id", "amount"]).serialize());
+        const { data: results } = await aqlQuery(q("transactions").filter({ account: primaryAccount.id, amount: { $gt: 0 } }).limit(1).select(["id", "amount"]).serialize());
         const lastDeposit = results[0];
         await runHandler(handlers2["transaction-update"], {
             ...lastDeposit,
@@ -122649,62 +122662,6 @@ async function importActual(_filepath, buffer) {
     await upload().catch(() => {
     });
 }
-function send(name, args) {
-    return send$2(name, args);
-}
-async function batchBudgetUpdates(func) {
-    await send("api/batch-budget-start");
-    try {
-        await func();
-    }
-    finally {
-        await send("api/batch-budget-end");
-    }
-}
-function aqlQuery(query) {
-    return send("api/query", { query: query.serialize() });
-}
-function setBudgetAmount(month, categoryId, value) {
-    return send("api/budget-set-amount", { month, categoryId, amount: value });
-}
-function setBudgetCarryover(month, categoryId, flag) {
-    return send("api/budget-set-carryover", { month, categoryId, flag });
-}
-function addTransactions(accountId, transactions, { learnCategories = false, runTransfers = false } = {}) {
-    return send("api/transactions-add", {
-        accountId,
-        transactions,
-        learnCategories,
-        runTransfers
-    });
-}
-function getAccounts() {
-    return send("api/accounts-get");
-}
-function createAccount(account, initialBalance) {
-    return send("api/account-create", { account, initialBalance });
-}
-function createCategoryGroup(group) {
-    return send("api/category-group-create", { group });
-}
-function getCategories() {
-    return send("api/categories-get", { grouped: false });
-}
-function createCategory(category) {
-    return send("api/category-create", { category });
-}
-function getPayees$1() {
-    return send("api/payees-get");
-}
-function createPayee$1(payee) {
-    return send("api/payee-create", { payee });
-}
-function updateRule$1(rule) {
-    return send("api/rule-update", { rule });
-}
-function createSchedule(schedule) {
-    return send("api/schedule-create", schedule);
-}
 function slash(path2) {
     const isExtendedLengthPath = path2.startsWith("\\\\?\\");
     if (isExtendedLengthPath) {
@@ -122716,10 +122673,12 @@ async function importAccounts$1(data, entityIdMap) {
     const accounts = sortByKey(data.accounts, "sortableIndex");
     return Promise.all(accounts.map(async (account) => {
         if (!account.isTombstone) {
-            const id2 = await createAccount({
-                name: account.accountName,
-                offbudget: account.onBudget ? false : true,
-                closed: account.hidden ? true : false
+            const id2 = await send("api/account-create", {
+                account: {
+                    name: account.accountName,
+                    offbudget: account.onBudget ? false : true,
+                    closed: account.hidden ? true : false
+                }
             });
             entityIdMap.set(account.entityId, id2);
         }
@@ -122729,13 +122688,18 @@ async function importCategories$1(data, entityIdMap) {
     const masterCategories = sortByKey(data.masterCategories, "sortableIndex");
     await Promise.all(masterCategories.map(async (masterCategory) => {
         if (masterCategory.type === "OUTFLOW" && !masterCategory.isTombstone && masterCategory.subCategories && masterCategory.subCategories.some((cat) => !cat.isTombstone)) {
-            const id2 = await createCategoryGroup({
-                name: masterCategory.name,
-                is_income: false
+            const id2 = await send("api/category-group-create", {
+                group: {
+                    name: masterCategory.name,
+                    is_income: false
+                }
             });
             entityIdMap.set(masterCategory.entityId, id2);
             if (masterCategory.note) {
-                send$2("notes-save", { id: id2, note: masterCategory.note });
+                void send("notes-save", {
+                    id: id2,
+                    note: masterCategory.note
+                });
             }
             if (masterCategory.subCategories) {
                 const subCategories = sortByKey(masterCategory.subCategories, "sortableIndex");
@@ -122748,13 +122712,18 @@ async function importCategories$1(data, entityIdMap) {
                             categoryNameParts.pop();
                             categoryName = categoryNameParts.join("/").trim();
                         }
-                        const id22 = await createCategory({
-                            name: categoryName,
-                            group_id: entityIdMap.get(category.masterCategoryId)
+                        const id22 = await send("api/category-create", {
+                            category: {
+                                name: categoryName,
+                                group_id: entityIdMap.get(category.masterCategoryId)
+                            }
                         });
                         entityIdMap.set(category.entityId, id22);
                         if (category.note) {
-                            send$2("notes-save", { id: id22, note: category.note });
+                            void send("notes-save", {
+                                id: id22,
+                                note: category.note
+                            });
                         }
                     }
                 }
@@ -122765,19 +122734,23 @@ async function importCategories$1(data, entityIdMap) {
 async function importPayees$1(data, entityIdMap) {
     for (const payee of data.payees) {
         if (!payee.isTombstone) {
-            const id2 = await createPayee$1({
-                name: payee.name,
-                transfer_acct: entityIdMap.get(payee.targetAccountId) || null
+            const id2 = await send("api/payee-create", {
+                payee: {
+                    name: payee.name,
+                    transfer_acct: entityIdMap.get(payee.targetAccountId) || null
+                }
             });
             entityIdMap.set(payee.entityId, id2);
         }
     }
 }
 async function importTransactions$1(data, entityIdMap) {
-    const categories = await getCategories();
+    const categories = await send("api/categories-get", {
+        grouped: false
+    });
     const incomeCategoryId = categories.find((cat) => cat.name === "Income").id;
-    const accounts = await getAccounts();
-    const payees = await getPayees$1();
+    const accounts = await send("api/accounts-get");
+    const payees = await send("api/payees-get");
     function getCategory2(id2) {
         if (id2 == null || id2 === "Category/__Split__") {
             return null;
@@ -122848,8 +122821,11 @@ async function importTransactions$1(data, entityIdMap) {
             };
             return newTransaction;
         }).filter((x2) => x2);
-        await addTransactions(entityIdMap.get(accountId), toImport, {
-            learnCategories: true
+        await send("api/transactions-add", {
+            accountId: entityIdMap.get(accountId),
+            transactions: toImport,
+            learnCategories: true,
+            runTransfers: false
         });
     }));
 }
@@ -122871,7 +122847,8 @@ function fillInBudgets(data, categoryBudgets) {
 }
 async function importBudgets$1(data, entityIdMap) {
     const budgets = sortByKey(data.monthlyBudgets, "month");
-    await batchBudgetUpdates(async () => {
+    await send("api/batch-budget-start");
+    try {
         for (const budget of budgets) {
             const filled = fillInBudgets(data, budget.monthlySubCategoryBudgets.filter((b) => !b.isTombstone));
             await Promise.all(filled.map(async (catBudget) => {
@@ -122881,16 +122858,31 @@ async function importBudgets$1(data, entityIdMap) {
                 if (!catId) {
                     return;
                 }
-                await setBudgetAmount(month, catId, amount);
+                await send("api/budget-set-amount", {
+                    month,
+                    categoryId: catId,
+                    amount
+                });
                 if (catBudget.overspendingHandling === "AffectsBuffer") {
-                    await setBudgetCarryover(month, catId, false);
+                    await send("api/budget-set-carryover", {
+                        month,
+                        categoryId: catId,
+                        flag: false
+                    });
                 }
                 else if (catBudget.overspendingHandling === "Confined") {
-                    await setBudgetCarryover(month, catId, true);
+                    await send("api/budget-set-carryover", {
+                        month,
+                        categoryId: catId,
+                        flag: true
+                    });
                 }
             }));
         }
-    });
+    }
+    finally {
+        await send("api/batch-budget-end");
+    }
 }
 function estimateRecentness(str) {
     return str.split(",").reduce((total, version) => {
@@ -123182,17 +123174,21 @@ function buildRuleUpdate(rule, actions) {
 function importAccounts(data, entityIdMap) {
     return Promise.all(data.accounts.map(async (account) => {
         if (!account.deleted) {
-            const id2 = await createAccount({
-                name: account.name,
-                offbudget: account.on_budget ? false : true,
-                closed: account.closed
+            const id2 = await send("api/account-create", {
+                account: {
+                    name: account.name,
+                    offbudget: account.on_budget ? false : true,
+                    closed: account.closed
+                }
             });
             entityIdMap.set(account.id, id2);
         }
     }));
 }
 async function importCategories(data, entityIdMap) {
-    const categories = await getCategories();
+    const categories = await send("api/categories-get", {
+        grouped: false
+    });
     const incomeCatId = findIdByName(categories, "Income");
     const ynabIncomeCategories = ["To be Budgeted", "Inflow: Ready to Assign"];
     function checkSpecialCat(cat) {
@@ -123217,7 +123213,9 @@ async function importCategories(data, entityIdMap) {
         while (true) {
             const name = count === 0 ? baseName : `${baseName} (${count})`;
             try {
-                const id2 = await createCategoryGroup({ ...params, name });
+                const id2 = await send("api/category-group-create", {
+                    group: { ...params, name }
+                });
                 return { id: id2, name };
             }
             catch (e) {
@@ -123235,7 +123233,9 @@ async function importCategories(data, entityIdMap) {
         while (true) {
             const name = count === 0 ? baseName : `${baseName} (${count})`;
             try {
-                const id2 = await createCategory({ ...params, name });
+                const id2 = await send("api/category-create", {
+                    category: { ...params, name }
+                });
                 return { id: id2, name };
             }
             catch (e) {
@@ -123259,7 +123259,10 @@ async function importCategories(data, entityIdMap) {
                 groupId = createdGroup.id;
                 entityIdMap.set(group.id, groupId);
                 if (group.note) {
-                    send$2("notes-save", { id: groupId, note: group.note });
+                    void send("notes-save", {
+                        id: groupId,
+                        note: group.note
+                    });
                 }
             }
             if (equalsIgnoreCase(group.name, "Income")) {
@@ -123290,7 +123293,7 @@ async function importCategories(data, entityIdMap) {
                             });
                             entityIdMap.set(cat.id, createdCategory.id);
                             if (cat.note) {
-                                send$2("notes-save", {
+                                void send("notes-save", {
                                     id: createdCategory.id,
                                     note: cat.note
                                 });
@@ -123305,8 +123308,8 @@ async function importCategories(data, entityIdMap) {
 function importPayees(data, entityIdMap) {
     return Promise.all(data.payees.map(async (payee) => {
         if (!payee.deleted) {
-            const id2 = await createPayee$1({
-                name: payee.name
+            const id2 = await send("api/payee-create", {
+                payee: { name: payee.name }
             });
             entityIdMap.set(payee.id, id2);
         }
@@ -123340,7 +123343,7 @@ async function importFlagsAsTags(data, flagNameConflicts) {
         return;
     }
     await Promise.all([...tagsToCreate.entries()].map(async ([tag, color]) => {
-        await send$2("tags-create", {
+        await send("tags-create", {
             tag,
             color,
             description: "Imported from YNAB"
@@ -123348,8 +123351,10 @@ async function importFlagsAsTags(data, flagNameConflicts) {
     }));
 }
 async function importTransactions(data, entityIdMap, flagNameConflicts) {
-    const payees = await getPayees$1();
-    const categories = await getCategories();
+    const payees = await send("api/payees-get");
+    const categories = await send("api/categories-get", {
+        grouped: false
+    });
     const incomeCatId = findIdByName(categories, "Income");
     const startingBalanceCatId = findIdByName(categories, "Starting Balances");
     const startingPayeeYNAB = findIdByName(data.payees, "Starting Balance");
@@ -123501,8 +123506,11 @@ async function importTransactions(data, entityIdMap, flagNameConflicts) {
             }
             return newTransaction;
         }).filter((x2) => x2);
-        await addTransactions(entityIdMap.get(accountId), toImport, {
-            learnCategories: true
+        await send("api/transactions-add", {
+            accountId: entityIdMap.get(accountId),
+            transactions: toImport,
+            learnCategories: true,
+            runTransfers: false
         });
     }));
 }
@@ -123512,7 +123520,7 @@ async function importScheduledTransactions(data, entityIdMap, flagNameConflicts)
     if (scheduledTransactions.length === 0) {
         return;
     }
-    const payees = await getPayees$1();
+    const payees = await send("api/payees-get");
     const payeesByTransferAcct = payees.filter((payee) => payee?.transfer_acct).map((payee) => [payee.transfer_acct, payee]);
     const payeeTransferAcctHashMap = new Map(payeesByTransferAcct);
     const scheduleCategoryMap = /* @__PURE__ */ new Map();
@@ -123523,7 +123531,10 @@ async function importScheduledTransactions(data, entityIdMap, flagNameConflicts)
         let count = 1;
         while (true) {
             try {
-                return await createSchedule({ ...params, name: params.name });
+                return await send("api/schedule-create", {
+                    ...params,
+                    name: params.name
+                });
             }
             catch (e) {
                 if (count >= MAX_RETRY) {
@@ -123536,11 +123547,15 @@ async function importScheduledTransactions(data, entityIdMap, flagNameConflicts)
         }
     }
     async function getRuleForSchedule2(scheduleId) {
-        const { data: ruleId } = await aqlQuery(q("schedules").filter({ id: scheduleId }).calculate("rule"));
+        const { data: ruleId } = await send("api/query", {
+            query: q("schedules").filter({ id: scheduleId }).calculate("rule").serialize()
+        });
         if (!ruleId) {
             return null;
         }
-        const { data: ruleData } = await aqlQuery(q("rules").filter({ id: ruleId }).select("*"));
+        const { data: ruleData } = await send("api/query", {
+            query: q("rules").filter({ id: ruleId }).select("*").serialize()
+        });
         const ruleRow = ruleData?.[0];
         if (!ruleRow) {
             return null;
@@ -123587,7 +123602,9 @@ async function importScheduledTransactions(data, entityIdMap, flagNameConflicts)
                     field: "notes",
                     value: scheduleNotes
                 });
-                await updateRule$1(buildRuleUpdate(rule, actions));
+                await send("api/rule-update", {
+                    rule: buildRuleUpdate(rule, actions)
+                });
             }
         }
         const scheduledSubtransactions = scheduledSubtransactionsGrouped.get(scheduled.id)?.filter((subtransaction) => !subtransaction.deleted) || [];
@@ -123613,7 +123630,9 @@ async function importScheduledTransactions(data, entityIdMap, flagNameConflicts)
                 field: "category",
                 value: categoryId
             });
-            await updateRule$1(buildRuleUpdate(rule, actions));
+            await send("api/rule-update", {
+                rule: buildRuleUpdate(rule, actions)
+            });
         }
         for (const [scheduleId, subtransactions] of scheduleSplitsMap.entries()) {
             const rule = await getRuleForSchedule2(scheduleId);
@@ -123680,7 +123699,9 @@ async function importScheduledTransactions(data, entityIdMap, flagNameConflicts)
                     }
                 }
             });
-            await updateRule$1(buildRuleUpdate(rule, actions));
+            await send("api/rule-update", {
+                rule: buildRuleUpdate(rule, actions)
+            });
         }
     }
 }
@@ -123688,7 +123709,8 @@ async function importBudgets(data, entityIdMap) {
     const budgets = sortByKey(data.months, "month");
     const internalCatIdYnab = findIdByName(data.category_groups, "Internal Master Category");
     const creditcardCatIdYnab = findIdByName(data.category_groups, "Credit Card Payments");
-    await batchBudgetUpdates(async () => {
+    await send("api/batch-budget-start");
+    try {
         for (const budget of budgets) {
             const month = monthFromDate(budget.month);
             await Promise.all(budget.categories.map(async (catBudget) => {
@@ -123697,10 +123719,17 @@ async function importBudgets(data, entityIdMap) {
                 if (!catId || catBudget.category_group_id === internalCatIdYnab || catBudget.category_group_id === creditcardCatIdYnab) {
                     return;
                 }
-                await setBudgetAmount(month, catId, amount);
+                await send("api/budget-set-amount", {
+                    month,
+                    categoryId: catId,
+                    amount
+                });
             }));
         }
-    });
+    }
+    finally {
+        await send("api/batch-budget-end");
+    }
 }
 function parseFile$1(buffer) {
     let data = JSON.parse(buffer.toString());
@@ -124742,7 +124771,7 @@ async function getBackups$1(id2) {
     let paths = [];
     if (await exists(backupDir)) {
         paths = await listDir(backupDir);
-        paths = paths.filter((file) => file.match(/\.sqlite$/));
+        paths = paths.filter((file) => file.match(/\.zip$/));
     }
     const backups = await Promise.all(paths.map(async (path2) => {
         const mtime = await getModifiedTime(join$1(backupDir, path2));
@@ -124807,16 +124836,31 @@ async function makeBackup$1(id2) {
     if (await exists(join$1(budgetDir, LATEST_BACKUP_FILENAME))) {
         await removeFile$1(join$1(getBudgetDir(id2), LATEST_BACKUP_FILENAME));
     }
-    const backupId = `${v4()}.sqlite`;
+    const backupId = `${format$2(/* @__PURE__ */ new Date(), "yyyy-MM-dd_HH-mm-ss")}.zip`;
     const backupPath = join$1(budgetDir, "backups", backupId);
     if (!await exists(join$1(budgetDir, "backups"))) {
         await mkdir(join$1(budgetDir, "backups"));
     }
-    await copyFile(join$1(budgetDir, "db.sqlite"), backupPath);
-    const db2 = await openDatabase$1(backupPath);
-    runQuery$1(db2, "DELETE FROM messages_crdt");
-    runQuery$1(db2, "DELETE FROM messages_clock");
-    closeDatabase$1(db2);
+    const tempDbPath = join$1(budgetDir, "backups", `db.${Date.now()}.sqlite.tmp`);
+    await copyFile(join$1(budgetDir, "db.sqlite"), tempDbPath);
+    let db2;
+    try {
+        db2 = await openDatabase$1(tempDbPath);
+        runQuery$1(db2, "DELETE FROM messages_crdt");
+        runQuery$1(db2, "DELETE FROM messages_clock");
+        const zip2 = new AdmZip();
+        zip2.addLocalFile(tempDbPath, "", "db.sqlite");
+        zip2.addLocalFile(join$1(budgetDir, "metadata.json"));
+        zip2.writeZip(backupPath);
+    }
+    finally {
+        if (db2) {
+            closeDatabase$1(db2);
+        }
+        if (await exists(tempDbPath)) {
+            await removeFile$1(tempDbPath);
+        }
+    }
     const toRemove = await updateBackups(await getBackups$1(id2));
     for (const id22 of toRemove) {
         await removeFile$1(join$1(budgetDir, "backups", id22));
@@ -124859,7 +124903,9 @@ async function loadBackup$1(id2, backupId) {
         catch {
         }
         unloadPrefs();
-        await copyFile(join$1(budgetDir, "backups", backupId), join$1(budgetDir, "db.sqlite"));
+        const zip2 = new AdmZip(join$1(budgetDir, "backups", backupId));
+        zip2.extractEntryTo("db.sqlite", budgetDir, false, true);
+        zip2.extractEntryTo("metadata.json", budgetDir, false, true);
     }
 }
 function startBackupService(id2) {
@@ -127016,7 +127062,7 @@ function sort(reports) {
     }) : 0);
 }
 async function getReports() {
-    const { data } = await aqlQuery$1(q("custom_reports").select("*"));
+    const { data } = await aqlQuery(q("custom_reports").select("*"));
     return sort(data.map(reportModel.toJS));
 }
 async function reportNameExists(name, reportId, newItem) {
@@ -127139,7 +127185,7 @@ async function renameDashboardPage({ id: id2, name }) {
     await updateWithSchema("dashboard_pages", { id: id2, name });
 }
 async function updateDashboard(widgets) {
-    const { data: dbWidgets } = await aqlQuery$1(q("dashboard").filter({ id: { $oneof: widgets.map(({ id: id2 }) => id2) } }).select("*"));
+    const { data: dbWidgets } = await aqlQuery(q("dashboard").filter({ id: { $oneof: widgets.map(({ id: id2 }) => id2) } }).select("*"));
     const dbWidgetMap = new Map(dbWidgets.map((widget) => [widget.id, widget]));
     await Promise.all(widgets.filter((widget) => !isMatch(dbWidgetMap.get(widget.id) ?? {}, widget)).map((widget) => update("dashboard", widget)));
 }
@@ -127485,7 +127531,7 @@ async function getCommonPayees() {
     return (await getCommonPayees$1()).map(payeeModel$1.fromDb);
 }
 async function getPayees() {
-    return (await getPayees$2()).map(payeeModel$1.fromDb);
+    return (await getPayees$1()).map(payeeModel$1.fromDb);
 }
 async function getOrphanedPayees() {
     return await syncGetOrphanedPayees();
@@ -127720,7 +127766,7 @@ async function updateRule(rule) {
     if (error) {
         return { error };
     }
-    await updateRule$2(rule);
+    await updateRule$1(rule);
     return rule;
 }
 async function deleteRule(id2) {
@@ -127891,7 +127937,7 @@ async function fixSplitTransactions() {
         const updated = deletedRows.map((row) => ({ id: row.id, tombstone: true }));
         await batchUpdateTransactions({ updated });
     });
-    const splitTransactions = (await aqlQuery$1(q("transactions").options({ splits: "grouped" }).filter({
+    const splitTransactions = (await aqlQuery(q("transactions").options({ splits: "grouped" }).filter({
         is_parent: true
     }).select("*"))).data;
     const mismatchedSplits = splitTransactions.filter((t2) => {
@@ -128575,7 +128621,7 @@ async function exportToCSV(transactions, accounts, categoryGroups, payees) {
     return stringify(transactionsForExport, { header: true });
 }
 async function exportQueryToCSV(query) {
-    const { data: transactions } = await aqlQuery$1(query.select([
+    const { data: transactions } = await aqlQuery(query.select([
         { Id: "id" },
         { Account: "account.name" },
         { Date: "date" },
@@ -136718,7 +136764,7 @@ async function mergeTransactions(transactions) {
             reconciled: keep.reconciled || drop2.reconciled
         });
     }
-    const { data: transactionsToDelete } = await aqlQuery$1(q("transactions").filter({ id: drop2.id }).select("*").options({ splits: "grouped" }));
+    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);
@@ -136778,11 +136824,11 @@ async function exportTransactionsQuery({ query: queryState }) {
     return exportQueryToCSV(new Query(queryState));
 }
 async function getEarliestTransaction() {
-    const { data } = await aqlQuery$1(q("transactions").options({ splits: "none" }).orderBy({ date: "asc" }).select("*").limit(1));
+    const { data } = await aqlQuery(q("transactions").options({ splits: "none" }).orderBy({ date: "asc" }).select("*").limit(1));
     return data[0] || null;
 }
 async function getLatestTransaction() {
-    const { data } = await aqlQuery$1(q("transactions").options({ splits: "none" }).orderBy({ date: "desc" }).select("*").limit(1));
+    const { data } = await aqlQuery(q("transactions").options({ splits: "none" }).orderBy({ date: "desc" }).select("*").limit(1));
     return data[0] || null;
 }
 const app = createApp();
@@ -136810,7 +136856,7 @@ exports.handlers["query"] = async function (query) {
     if (query["table"] == null) {
         throw new Error("query has no table, did you forgot to call `.serialize`?");
     }
-    return aqlQuery$1(query);
+    return aqlQuery(query);
 };
 exports.handlers["get-server-version"] = async function () {
     if (!getServer()) {
@@ -136856,7 +136902,6 @@ exports.handlers["app-focused"] = async function () {
     }
 };
 exports.handlers = installAPI(exports.handlers);
-override((name, args) => runHandler(app$j.handlers[name], args));
 app$j.handlers = exports.handlers;
 app$j.combine(app$g, app$f, app$e, app$b, app$8, app$6, app$1, app$9, app$c, app$5, app$h, app, app$i, app$7, app$4, app$3, app$d, app$a, app$2);
 function getDefaultDocumentDir() {
@@ -136906,7 +136951,7 @@ async function initApp(isDev, socketName) {
     }
     setServer(url);
     init$2(socketName, app$j.handlers);
-    global.$query = aqlQuery$1;
+    global.$query = aqlQuery;
     global.$q = q;
     if (isDev) {
         global.$send = (name, args) => runHandler(app$j.handlers[name], args);