@actual-app/api 6.8.1 → 6.9.0

package/@types/loot-core/client/constants.d.ts

@@ -5,6 +5,7 @@ export declare const MARK_ACCOUNT_READ = "MARK_ACCOUNT_READ";
 export declare const LOAD_ACCOUNTS = "LOAD_ACCOUNTS";
 export declare const UPDATE_ACCOUNT = "UPDATE_ACCOUNT";
 export declare const LOAD_CATEGORIES = "LOAD_CATEGORIES";
+export declare const LOAD_COMMON_PAYEES = "LOAD_COMMON_PAYEES";
 export declare const LOAD_PAYEES = "LOAD_PAYEES";
 export declare const SET_PREFS = "SET_PREFS";
 export declare const MERGE_LOCAL_PREFS = "MERGE_LOCAL_PREFS";

package/@types/loot-core/client/state-types/modals.d.ts

@@ -4,6 +4,7 @@ import type {
   CategoryEntity,
   CategoryGroupEntity,
   GoCardlessToken,
+  TransactionEntity,
 } from '../../types/models';
 import type { NewRuleEntity, RuleEntity } from '../../types/models/rule';
 import type { EmptyObject, StripNever } from '../../types/util';
@@ -121,14 +122,13 @@ type FinanceModals = {
     month: string;
   };
 
-  'schedule-edit': { id: string } | null;
+  'schedule-edit': { id: string; transaction?: TransactionEntity } | null;
 
   'schedule-link': { transactionIds: string[] } | null;
 
   'schedules-discover': null;
 
   'schedule-posts-offline-notification': null;
-  'switch-budget-type': { onSwitch: () => void };
   'account-menu': {
     accountId: string;
     onSave: (account: AccountEntity) => void;
@@ -142,6 +142,7 @@ type FinanceModals = {
     onSave: (category: CategoryEntity) => void;
     onEditNotes: (id: string) => void;
     onDelete: (categoryId: string) => void;
+    onToggleVisibility: (categoryId: string) => void;
     onBudgetAction: (month: string, action: string, args?: unknown) => void;
     onClose?: () => void;
   };
@@ -167,6 +168,7 @@ type FinanceModals = {
     onAddCategory: (groupId: string, isIncome: boolean) => void;
     onEditNotes: (id: string) => void;
     onDelete: (groupId: string) => void;
+    onToggleVisibility: (groupId: string) => void;
     onClose?: () => void;
   };
   notes: {
@@ -201,6 +203,7 @@ type FinanceModals = {
   'rollover-summary-to-budget-menu': {
     month: string;
     onTransfer: () => void;
+    onCover: () => void;
     onHoldBuffer: () => void;
     onResetHoldBuffer: () => void;
   };
@@ -217,8 +220,9 @@ type FinanceModals = {
     showToBeBudgeted?: boolean;
   };
   cover: {
-    categoryId: string;
+    title: string;
     month: string;
+    showToBeBudgeted?: boolean;
     onSubmit: (fromCategoryId: string) => void;
   };
   'hold-buffer': {
@@ -234,7 +238,6 @@ type FinanceModals = {
     onAddCategoryGroup: () => void;
     onToggleHiddenCategories: () => void;
     onSwitchBudgetFile: () => void;
-    onSwitchBudgetType: () => void;
   };
   'rollover-budget-month-menu': {
     month: string;
@@ -249,6 +252,7 @@ type FinanceModals = {
   'budget-list';
   'confirm-transaction-edit': {
     onConfirm: () => void;
+    onCancel?: () => void;
     confirmReason: string;
   };
   'confirm-transaction-delete': {
@@ -290,3 +294,9 @@ export type ModalsState = {
   modalStack: Modal[];
   isHidden: boolean;
 };
+
+type Modal = {
+  name: string;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  options?: any;
+};

package/@types/loot-core/client/state-types/queries.d.ts

@@ -11,6 +11,8 @@ export type QueriesState = {
   accountsLoaded: boolean;
   categories: Awaited<ReturnType<Handlers['get-categories']>>;
   categoriesLoaded: boolean;
+  commonPayeesLoaded: boolean;
+  commonPayees: Awaited<ReturnType<Handlers['common-payees-get']>>;
   payees: Awaited<ReturnType<Handlers['payees-get']>>;
   payeesLoaded: boolean;
   earliestTransaction: unknown | null;
@@ -58,6 +60,11 @@ type LoadPayeesAction = {
   payees: State['payees'];
 };
 
+type LoadCommonPayeesAction = {
+  type: typeof constants.LOAD_COMMON_PAYEES;
+  payees: State['common_payees'];
+};
+
 export type QueriesActions =
   | SetNewTransactionsAction
   | UpdateNewTransactionsAction
@@ -66,4 +73,5 @@ export type QueriesActions =
   | LoadAccountsAction
   | UpdateAccountAction
   | LoadCategoriesAction
+  | LoadCommonPayeesAction
   | LoadPayeesAction;

package/@types/loot-core/platform/server/sqlite/index.d.ts

@@ -1,10 +1,10 @@
-import { type Database } from 'better-sqlite3';
+import { type Database } from '@jlongster/sql.js';
 
-export async function init(): unknown;
+export async function init(): Promise<void>;
 
 export function _getModule(): SqlJsStatic;
 
-export function prepare(db, sql): unknown;
+export function prepare(db: Database, sql: string): string;
 
 export function runQuery(
   db: Database,

package/@types/loot-core/server/accounts/sync.d.ts

@@ -1,7 +1,14 @@
 export declare function getGoCardlessAccounts(userId: any, userKey: any, id: any): Promise<any>;
-export declare function reconcileTransactions(acctId: any, transactions: any, isBankSyncAccount?: boolean): Promise<{
+export declare function reconcileTransactions(acctId: any, transactions: any, isBankSyncAccount?: boolean, isPreview?: boolean): Promise<{
     added: any[];
     updated: any[];
+    updatedPreview: any[];
+}>;
+export declare function matchTransactions(acctId: any, transactions: any, isBankSyncAccount?: boolean): Promise<{
+    payeesToCreate: Map<any, any>;
+    transactionsStep1: any[];
+    transactionsStep2: any[];
+    transactionsStep3: any[];
 }>;
 export declare function addTransactions(acctId: any, transactions: any, { runTransfers, learnCategories }?: {
     runTransfers?: boolean;
@@ -10,4 +17,8 @@ export declare function addTransactions(acctId: any, transactions: any, { runTra
 export declare function syncAccount(userId: string, userKey: string, id: string, acctId: string, bankId: string): Promise<{
     added: any[];
     updated: any[];
+    updatedPreview: any[];
+} | {
+    added: any[];
+    updated: any[];
 }>;

package/@types/loot-core/server/accounts/transactions.d.ts

@@ -1,20 +1,8 @@
-import { TransactionEntity } from '../../types/models';
+import { NewTransactionEntity, TransactionEntity } from '../../types/models';
 export declare function batchUpdateTransactions({ added, deleted, updated, learnCategories, detectOrphanPayees, runTransfers, }: {
-    added?: Array<{
-        id: string;
-        payee: unknown;
-        category: unknown;
-    }>;
-    deleted?: Array<{
-        id: string;
-        payee: unknown;
-    }>;
-    updated?: Array<{
-        id: string;
-        payee?: unknown;
-        account?: unknown;
-        category?: unknown;
-    }>;
+    added?: Array<Partial<NewTransactionEntity | TransactionEntity>>;
+    deleted?: Array<Partial<NewTransactionEntity | TransactionEntity>>;
+    updated?: Array<Partial<NewTransactionEntity | TransactionEntity>>;
     learnCategories?: boolean;
     detectOrphanPayees?: boolean;
     runTransfers?: boolean;

package/@types/loot-core/server/api-models.d.ts

@@ -1,4 +1,6 @@
+import { Budget } from '../types/budget';
 import type { AccountEntity, CategoryEntity, CategoryGroupEntity, PayeeEntity } from '../types/models';
+import { RemoteFile } from './cloud-storage';
 export type APIAccountEntity = Pick<AccountEntity, 'id' | 'name'> & {
     offbudget: boolean;
     closed: boolean;
@@ -64,3 +66,16 @@ export declare const payeeModel: {
         update?: boolean;
     }): PayeeEntity;
 };
+export type APIFileEntity = Omit<RemoteFile, 'deleted' | 'fileId'> & {
+    id?: string;
+    cloudFileId: string;
+    state?: 'remote';
+};
+export declare const remoteFileModel: {
+    toExternal(file: RemoteFile): APIFileEntity | null;
+    fromExternal(file: APIFileEntity): RemoteFile;
+};
+export declare const budgetModel: {
+    toExternal(file: Budget): APIFileEntity;
+    fromExternal(file: APIFileEntity): Budget;
+};

package/@types/loot-core/server/aql/schema/index.d.ts

@@ -75,6 +75,9 @@ export declare const schema: {
         tombstone: {
             type: string;
         };
+        favorite: {
+            type: string;
+        };
     };
     accounts: {
         id: {
@@ -95,6 +98,12 @@ export declare const schema: {
         tombstone: {
             type: string;
         };
+        account_id: {
+            type: string;
+        };
+        official_name: {
+            type: string;
+        };
         account_sync_source: {
             type: string;
         };
@@ -271,6 +280,9 @@ export declare const schema: {
         show_uncategorized: {
             type: string;
         };
+        include_current: {
+            type: string;
+        };
         selected_categories: {
             type: string;
         };
@@ -315,6 +327,9 @@ export declare const schema: {
         goal: {
             type: string;
         };
+        long_goal: {
+            type: string;
+        };
     };
     zero_budgets: {
         id: {
@@ -335,6 +350,9 @@ export declare const schema: {
         goal: {
             type: string;
         };
+        long_goal: {
+            type: string;
+        };
     };
 };
 export declare const schemaConfig: SchemaConfig;

package/@types/loot-core/server/budget/actions.d.ts

@@ -9,10 +9,11 @@ export declare function setBudget({ category, month, amount, }: {
     month: string;
     amount: unknown;
 }): Promise<void>;
-export declare function setGoal({ month, category, goal }: {
+export declare function setGoal({ month, category, goal, long_goal }: {
     month: any;
     category: any;
     goal: any;
+    long_goal: any;
 }): Promise<void>;
 export declare function setBuffer(month: string, amount: unknown): Promise<void>;
 export declare function copyPreviousMonth({ month, }: {
@@ -50,6 +51,10 @@ export declare function transferAvailable({ month, amount, category, }: {
     amount: number;
     category: string;
 }): Promise<void>;
+export declare function coverOverbudgeted({ month, category, }: {
+    month: string;
+    category: string;
+}): Promise<void>;
 export declare function transferCategory({ month, amount, from, to, }: {
     month: string;
     amount: number;

package/@types/loot-core/server/budget/app.d.ts

@@ -4,7 +4,7 @@ export declare const app: {
     handlers: BudgetHandlers;
     services: any;
     unlistenServices: any;
-    method<Name extends "budget/budget-amount" | "budget/copy-previous-month" | "budget/set-zero" | "budget/set-3month-avg" | "budget/check-templates" | "budget/apply-goal-template" | "budget/overwrite-goal-template" | "budget/cleanup-goal-template" | "budget/hold-for-next-month" | "budget/reset-hold" | "budget/cover-overspending" | "budget/transfer-available" | "budget/transfer-category" | "budget/set-carryover" | "budget/apply-single-template" | "budget/set-n-month-avg" | "budget/copy-single-month">(name: Name, func: BudgetHandlers[Name]): void;
+    method<Name extends "budget/budget-amount" | "budget/copy-previous-month" | "budget/set-zero" | "budget/set-3month-avg" | "budget/check-templates" | "budget/apply-goal-template" | "budget/overwrite-goal-template" | "budget/cleanup-goal-template" | "budget/hold-for-next-month" | "budget/reset-hold" | "budget/cover-overspending" | "budget/transfer-available" | "budget/cover-overbudgeted" | "budget/transfer-category" | "budget/set-carryover" | "budget/apply-single-template" | "budget/set-n-month-avg" | "budget/copy-single-month">(name: Name, func: BudgetHandlers[Name]): void;
     service(func: any): void;
     combine(...apps: any[]): void;
     startServices(): void;

package/@types/loot-core/server/budget/types/handlers.d.ts

@@ -46,6 +46,11 @@ export interface BudgetHandlers {
     category: string;
   }) => Promise<void>;
 
+  'budget/cover-overbudgeted': (arg: {
+    month: string;
+    category: string;
+  }) => Promise<void>;
+
   'budget/transfer-category': (arg: {
     month: string;
     amount: number;

package/@types/loot-core/server/db/index.d.ts

@@ -1,16 +1,56 @@
+import { Database } from '@jlongster/sql.js';
 import { CategoryEntity, CategoryGroupEntity } from '../../types/models';
 export { toDateRepr, fromDateRepr } from '../models';
-export declare function getDatabasePath(): any;
-export declare function openDatabase(id?: any): Promise<void>;
-export declare function reopenDatabase(): Promise<void>;
+export declare function getDatabasePath(): string;
+export declare function openDatabase(id?: string): Promise<void>;
 export declare function closeDatabase(): Promise<void>;
-export declare function setDatabase(db_: any): void;
-export declare function getDatabase(): any;
+export declare function setDatabase(db_: Database): void;
+export declare function getDatabase(): {
+    close(): void;
+    create_function(name: string, func: (...args: any[]) => any): any;
+    each(sql: string, params: import("@jlongster/sql.js").BindParams, callback: import("@jlongster/sql.js").ParamsCallback, done: () => void): any;
+    each(sql: string, callback: import("@jlongster/sql.js").ParamsCallback, done: () => void): any;
+    exec(sql: string, params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").QueryExecResult[];
+    export(): Uint8Array;
+    getRowsModified(): number;
+    handleError(): null;
+    iterateStatements(sql: string): {
+        getRemainingSql(): string;
+        next(): import("@jlongster/sql.js").StatementIteratorResult;
+        [Symbol.iterator](): Iterator<{
+            bind(values?: import("@jlongster/sql.js").BindParams): boolean;
+            free(): boolean;
+            freemem(): void;
+            get(params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").SqlValue[];
+            getAsObject(params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").ParamsObject;
+            getColumnNames(): string[];
+            getNormalizedSQL(): string;
+            getSQL(): string;
+            reset(): void;
+            run(values?: import("@jlongster/sql.js").BindParams): void;
+            step(): boolean;
+        }, any, undefined>;
+    };
+    prepare(sql: string, params?: import("@jlongster/sql.js").BindParams): {
+        bind(values?: import("@jlongster/sql.js").BindParams): boolean;
+        free(): boolean;
+        freemem(): void;
+        get(params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").SqlValue[];
+        getAsObject(params?: import("@jlongster/sql.js").BindParams): import("@jlongster/sql.js").ParamsObject;
+        getColumnNames(): string[];
+        getNormalizedSQL(): string;
+        getSQL(): string;
+        reset(): void;
+        run(values?: import("@jlongster/sql.js").BindParams): void;
+        step(): boolean;
+    };
+    run(sql: string, params?: import("@jlongster/sql.js").BindParams): any;
+};
 export declare function loadClock(): Promise<void>;
 export declare function runQuery(sql: string, params?: Array<string | number>, fetchAll?: false): any;
 export declare function runQuery(sql: string, params: Array<string | number> | undefined, fetchAll: true): any;
-export declare function execQuery(sql: any): void;
-export declare function cache(sql: any): any;
+export declare function execQuery(sql: string): void;
+export declare function cache(sql: string): any;
 export declare function transaction(fn: () => void): void;
 export declare function asyncTransaction(fn: () => Promise<void>): Promise<void>;
 export declare function all(sql: any, params?: (string | number)[]): Promise<any>;
@@ -45,6 +85,7 @@ export declare function deleteTransferPayee(payee: any): Promise<void>;
 export declare function updatePayee(payee: any): Promise<void>;
 export declare function mergePayees(target: string, ids: string[]): Promise<void>;
 export declare function getPayees(): Promise<any>;
+export declare function getCommonPayees(): Promise<any>;
 export declare function syncGetOrphanedPayees(): Promise<any>;
 export declare function getOrphanedPayees(): Promise<any>;
 export declare function getPayeeByName(name: any): Promise<any>;

package/@types/loot-core/server/main-app.d.ts

@@ -4,7 +4,7 @@ export declare const app: {
     handlers: Handlers;
     services: any;
     unlistenServices: any;
-    method<Name extends "transaction-update" | "undo" | "redo" | "transactions-batch-update" | "transaction-add" | "transaction-delete" | "transactions-parse-file" | "transactions-export" | "transactions-export-query" | "get-categories" | "get-earliest-transaction" | "get-budget-bounds" | "rollover-budget-month" | "report-budget-month" | "budget-set-type" | "category-create" | "category-update" | "category-move" | "category-delete" | "category-group-create" | "category-group-update" | "category-group-move" | "category-group-delete" | "must-category-transfer" | "payee-create" | "payees-get" | "payees-get-rule-counts" | "payees-merge" | "payees-batch-change" | "payees-check-orphaned" | "payees-get-rules" | "make-filters-from-conditions" | "getCell" | "getCells" | "getCellNamesInSheet" | "debugCell" | "create-query" | "query" | "account-update" | "accounts-get" | "account-properties" | "gocardless-accounts-link" | "simplefin-accounts-link" | "account-create" | "account-close" | "account-reopen" | "account-move" | "secret-set" | "secret-check" | "gocardless-poll-web-token" | "gocardless-status" | "simplefin-status" | "simplefin-accounts" | "gocardless-get-banks" | "gocardless-poll-web-token-stop" | "gocardless-create-web-token" | "accounts-bank-sync" | "transactions-import" | "account-unlink" | "save-global-prefs" | "load-global-prefs" | "save-prefs" | "load-prefs" | "sync-reset" | "sync-repair" | "key-make" | "key-test" | "get-did-bootstrap" | "subscribe-needs-bootstrap" | "subscribe-bootstrap" | "subscribe-get-user" | "subscribe-change-password" | "subscribe-sign-in" | "subscribe-sign-out" | "get-server-version" | "get-server-url" | "set-server-url" | "sync" | "get-budgets" | "get-remote-files" | "reset-budget-cache" | "upload-budget" | "download-budget" | "sync-budget" | "load-budget" | "create-demo-budget" | "close-budget" | "delete-budget" | "create-budget" | "import-budget" | "export-budget" | "upload-file-web" | "backups-get" | "backup-load" | "backup-make" | "get-last-opened-backup" | "app-focused" | "api/batch-budget-start" | "api/batch-budget-end" | "api/load-budget" | "api/download-budget" | "api/start-import" | "api/finish-import" | "api/abort-import" | "api/query" | "api/budget-months" | "api/budget-month" | "api/budget-set-amount" | "api/budget-set-carryover" | "api/transactions-export" | "api/transactions-import" | "api/transactions-add" | "api/transactions-get" | "api/transaction-update" | "api/transaction-delete" | "api/sync" | "api/bank-sync" | "api/accounts-get" | "api/account-create" | "api/account-update" | "api/account-close" | "api/account-reopen" | "api/account-delete" | "api/categories-get" | "api/category-groups-get" | "api/category-group-create" | "api/category-group-update" | "api/category-group-delete" | "api/category-create" | "api/category-update" | "api/category-delete" | "api/payees-get" | "api/payee-create" | "api/payee-update" | "api/payee-delete" | "api/rules-get" | "api/payee-rules-get" | "api/rule-create" | "api/rule-update" | "api/rule-delete" | "budget/budget-amount" | "budget/copy-previous-month" | "budget/set-zero" | "budget/set-3month-avg" | "budget/check-templates" | "budget/apply-goal-template" | "budget/overwrite-goal-template" | "budget/cleanup-goal-template" | "budget/hold-for-next-month" | "budget/reset-hold" | "budget/cover-overspending" | "budget/transfer-available" | "budget/transfer-category" | "budget/set-carryover" | "budget/apply-single-template" | "budget/set-n-month-avg" | "budget/copy-single-month" | "filter-create" | "filter-update" | "filter-delete" | "notes-save" | "report/create" | "report/update" | "report/delete" | "rule-validate" | "rule-add" | "rule-update" | "rule-delete" | "rule-delete-all" | "rule-apply-actions" | "rule-add-payee-rename" | "rules-get" | "rule-get" | "rules-run" | "schedule/create" | "schedule/update" | "schedule/delete" | "schedule/skip-next-date" | "schedule/post-transaction" | "schedule/force-run-service" | "schedule/discover" | "schedule/get-upcoming-dates" | "tools/fix-split-transactions">(name: Name, func: Handlers[Name]): void;
+    method<Name extends "sync" | "query" | "transaction-update" | "undo" | "redo" | "transactions-batch-update" | "transaction-add" | "transaction-delete" | "transactions-parse-file" | "transactions-export" | "transactions-export-query" | "get-categories" | "get-earliest-transaction" | "get-budget-bounds" | "rollover-budget-month" | "report-budget-month" | "budget-set-type" | "category-create" | "category-update" | "category-move" | "category-delete" | "category-group-create" | "category-group-update" | "category-group-move" | "category-group-delete" | "must-category-transfer" | "payee-create" | "common-payees-get" | "payees-get" | "payees-get-rule-counts" | "payees-merge" | "payees-batch-change" | "payees-check-orphaned" | "payees-get-rules" | "make-filters-from-conditions" | "getCell" | "getCells" | "getCellNamesInSheet" | "debugCell" | "create-query" | "account-update" | "accounts-get" | "account-properties" | "gocardless-accounts-link" | "simplefin-accounts-link" | "account-create" | "account-close" | "account-reopen" | "account-move" | "secret-set" | "secret-check" | "gocardless-poll-web-token" | "gocardless-status" | "simplefin-status" | "simplefin-accounts" | "gocardless-get-banks" | "gocardless-poll-web-token-stop" | "gocardless-create-web-token" | "accounts-bank-sync" | "transactions-import" | "account-unlink" | "save-global-prefs" | "load-global-prefs" | "save-prefs" | "load-prefs" | "sync-reset" | "sync-repair" | "key-make" | "key-test" | "get-did-bootstrap" | "subscribe-needs-bootstrap" | "subscribe-bootstrap" | "subscribe-get-user" | "subscribe-change-password" | "subscribe-sign-in" | "subscribe-sign-out" | "get-server-version" | "get-server-url" | "set-server-url" | "get-budgets" | "get-remote-files" | "reset-budget-cache" | "upload-budget" | "download-budget" | "sync-budget" | "load-budget" | "create-demo-budget" | "close-budget" | "delete-budget" | "create-budget" | "import-budget" | "export-budget" | "upload-file-web" | "backups-get" | "backup-load" | "backup-make" | "get-last-opened-backup" | "app-focused" | "api/batch-budget-start" | "api/batch-budget-end" | "api/load-budget" | "api/download-budget" | "api/get-budgets" | "api/start-import" | "api/finish-import" | "api/abort-import" | "api/query" | "api/budget-months" | "api/budget-month" | "api/budget-set-amount" | "api/budget-set-carryover" | "api/transactions-export" | "api/transactions-import" | "api/transactions-add" | "api/transactions-get" | "api/transaction-update" | "api/transaction-delete" | "api/sync" | "api/bank-sync" | "api/accounts-get" | "api/account-create" | "api/account-update" | "api/account-close" | "api/account-reopen" | "api/account-delete" | "api/account-balance" | "api/categories-get" | "api/category-groups-get" | "api/category-group-create" | "api/category-group-update" | "api/category-group-delete" | "api/category-create" | "api/category-update" | "api/category-delete" | "api/payees-get" | "api/common-payees-get" | "api/payee-create" | "api/payee-update" | "api/payee-delete" | "api/payees-merge" | "api/rules-get" | "api/payee-rules-get" | "api/rule-create" | "api/rule-update" | "api/rule-delete" | "budget/budget-amount" | "budget/copy-previous-month" | "budget/set-zero" | "budget/set-3month-avg" | "budget/check-templates" | "budget/apply-goal-template" | "budget/overwrite-goal-template" | "budget/cleanup-goal-template" | "budget/hold-for-next-month" | "budget/reset-hold" | "budget/cover-overspending" | "budget/transfer-available" | "budget/cover-overbudgeted" | "budget/transfer-category" | "budget/set-carryover" | "budget/apply-single-template" | "budget/set-n-month-avg" | "budget/copy-single-month" | "filter-create" | "filter-update" | "filter-delete" | "notes-save" | "report/create" | "report/update" | "report/delete" | "rule-validate" | "rule-add" | "rule-update" | "rule-delete" | "rule-delete-all" | "rule-apply-actions" | "rule-add-payee-rename" | "rules-get" | "rule-get" | "rules-run" | "schedule/create" | "schedule/update" | "schedule/delete" | "schedule/skip-next-date" | "schedule/post-transaction" | "schedule/force-run-service" | "schedule/discover" | "schedule/get-upcoming-dates" | "tools/fix-split-transactions">(name: Name, func: Handlers[Name]): void;
     service(func: any): void;
     combine(...apps: any[]): void;
     startServices(): void;

package/@types/loot-core/server/migrate/migrations.d.ts

@@ -1,4 +1,4 @@
-import { Database } from 'better-sqlite3';
+import { Database } from '@jlongster/sql.js';
 export declare function withMigrationsDir(dir: string, func: () => Promise<void>): Promise<void>;
 export declare function getMigrationsDir(): string;
 export declare function getUpMigration(id: any, names: any): any;

package/@types/loot-core/server/post.d.ts

@@ -1,3 +1,3 @@
-export declare function post(url: any, data: any, headers?: {}): Promise<any>;
+export declare function post(url: any, data: any, headers?: {}, timeout?: any): Promise<any>;
 export declare function postBinary(url: any, data: any, headers: any): Promise<any>;
 export declare function get(url: any, opts?: any): Promise<string>;

package/@types/loot-core/shared/normalisation.d.ts

@@ -0,0 +1 @@
+export declare function getNormalisedString(value: string): string;

package/@types/loot-core/shared/rules.d.ts

@@ -31,7 +31,7 @@ export declare const ALLOCATION_METHODS: {
     remainder: string;
 };
 export declare function mapField(field: any, opts?: any): any;
-export declare function friendlyOp(op: any, type?: any): "" | "is" | "contains" | "one of" | "not one of" | "is not" | "is approx" | "is between" | "does not contain" | "is after" | "is greater than" | "is after or equals" | "is greater than or equals" | "is before" | "is less than" | "is before or equals" | "is less than or equals" | "is true" | "is false" | "set" | "allocate" | "link schedule" | "and" | "or";
+export declare function friendlyOp(op: any, type?: any): "" | "is" | "contains" | "matches" | "one of" | "not one of" | "is not" | "is approx" | "is between" | "does not contain" | "is after" | "is greater than" | "is after or equals" | "is greater than or equals" | "is before" | "is less than" | "is before or equals" | "is less than or equals" | "is true" | "is false" | "set" | "allocate" | "link schedule" | "and" | "or";
 export declare function deserializeField(field: any): {
     field: string;
     options: {

package/@types/loot-core/shared/transactions.d.ts

@@ -73,8 +73,6 @@ export declare function realizeTempTransactions(transactions: TransactionEntity[
     payee?: import("../types/models").PayeeEntity;
     schedule?: import("../types/models").ScheduleEntity;
     subtransactions?: TransactionEntity[];
-    sort_order?: number;
-    tombstone?: boolean;
     imported_payee?: string;
     date: string;
     notes?: string;
@@ -87,5 +85,32 @@ export declare function realizeTempTransactions(transactions: TransactionEntity[
     imported_id?: string;
     starting_balance_flag?: boolean;
     transfer_id?: string;
+    sort_order?: number;
+    tombstone?: boolean;
 }[];
+export declare function makeAsNonChildTransactions(childTransactionsToUpdate: TransactionEntity[], transactions: TransactionEntity[]): {
+    updated: TransactionEntity[];
+    deleted: {
+        amount: number;
+        id: string;
+        account: import("../types/models").AccountEntity;
+        category?: import("../types/models").CategoryEntity;
+        payee?: import("../types/models").PayeeEntity;
+        schedule?: import("../types/models").ScheduleEntity;
+        subtransactions?: TransactionEntity[];
+        imported_payee?: string;
+        date: string;
+        notes?: string;
+        cleared?: boolean;
+        reconciled?: boolean;
+        is_parent?: boolean;
+        is_child?: boolean;
+        parent_id?: string;
+        imported_id?: string;
+        starting_balance_flag?: boolean;
+        transfer_id?: string;
+        sort_order?: number;
+        tombstone?: boolean;
+    }[];
+};
 export {};

package/@types/loot-core/shared/util.d.ts

@@ -31,7 +31,7 @@ export declare function getIn(map: any, keys: any): any;
 export declare function fastSetMerge<T>(set1: Set<T>, set2: Set<T>): Set<T>;
 export declare function titleFirst(str: string): string;
 export declare function appendDecimals(amountText: string, hideDecimals?: boolean): string;
-type NumberFormats = 'comma-dot' | 'dot-comma' | 'space-comma' | 'space-dot' | 'comma-dot-in';
+type NumberFormats = 'comma-dot' | 'dot-comma' | 'space-comma' | 'apostrophe-dot' | 'comma-dot-in';
 export declare const numberFormats: Array<{
     value: NumberFormats;
     label: string;

package/@types/loot-core/types/api-handlers.d.ts

@@ -3,6 +3,7 @@ import type {
   APIAccountEntity,
   APICategoryEntity,
   APICategoryGroupEntity,
+  APIFileEntity,
   APIPayeeEntity,
 } from '../server/api-models';
 
@@ -23,6 +24,8 @@ export interface ApiHandlers {
     password?: string;
   }) => Promise<void>;
 
+  'api/get-budgets': () => Promise<APIFileEntity[]>;
+
   'api/start-import': (arg: { budgetName: string }) => Promise<void>;
 
   'api/finish-import': () => Promise<void>;
@@ -114,6 +117,11 @@ export interface ApiHandlers {
 
   'api/account-delete': (arg: { id }) => Promise<unknown>;
 
+  'api/account-balance': (arg: {
+    id: string;
+    cutoff?: Date;
+  }) => Promise<number>;
+
   'api/categories-get': (arg: {
     grouped;
   }) => Promise<Array<APICategoryGroupEntity | APICategoryEntity>>;
@@ -140,12 +148,19 @@ export interface ApiHandlers {
 
   'api/payees-get': () => Promise<APIPayeeEntity[]>;
 
+  'api/common-payees-get': () => Promise<APIPayeeEntity[]>;
+
   'api/payee-create': (arg: { payee }) => Promise<string>;
 
   'api/payee-update': (arg: { id; fields }) => Promise<unknown>;
 
   'api/payee-delete': (arg: { id }) => Promise<unknown>;
 
+  'api/payees-merge': (arg: {
+    targetId: string;
+    mergeIds: string[];
+  }) => Promise<void>;
+
   'api/rules-get': () => Promise<RuleEntity[]>;
 
   'api/payee-rules-get': (arg: { id: string }) => Promise<RuleEntity[]>;

package/@types/loot-core/types/file.d.ts

@@ -10,12 +10,14 @@ export type FileState =
 
 export type LocalFile = Omit<Budget, 'cloudFileId' | 'groupId'> & {
   state: 'local';
+  hasKey: boolean;
 };
 
 export type SyncableLocalFile = Budget & {
   cloudFileId: string;
   groupId: string;
   state: 'broken' | 'unknown';
+  hasKey: boolean;
 };
 
 export type SyncedLocalFile = Budget & {

package/@types/loot-core/types/models/payee.d.ts

@@ -2,6 +2,7 @@ export interface NewPayeeEntity {
   id?: string;
   name: string;
   transfer_acct?: string;
+  favorite?: boolean;
   tombstone?: boolean;
 }
 

package/@types/loot-core/types/models/reports.d.ts

@@ -15,6 +15,7 @@ export interface CustomReportEntity {
   showEmpty: boolean;
   showOffBudget: boolean;
   showHiddenCategories: boolean;
+  includeCurrentInterval: boolean;
   showUncategorized: boolean;
   selectedCategories?: CategoryEntity[];
   graphType: string;
@@ -24,6 +25,21 @@ export interface CustomReportEntity {
   tombstone?: boolean;
 }
 
+export type balanceTypeOpType =
+  | 'totalAssets'
+  | 'totalDebts'
+  | 'totalTotals'
+  | 'netAssets'
+  | 'netDebts';
+
+export type spendingReportTimeType =
+  | 'average'
+  | 'thisMonth'
+  | 'lastMonth'
+  | 'twoMonthsPrevious'
+  | 'lastYear'
+  | 'lastYearPrevious';
+
 export type SpendingMonthEntity = Record<
   string | number,
   {
@@ -49,6 +65,9 @@ export interface SpendingEntity {
     average: number;
     thisMonth: number;
     lastMonth: number;
+    twoMonthsPrevious: number;
+    lastYear: number;
+    lastYearPrevious: number;
   }[];
   startDate?: string;
   endDate?: string;
@@ -66,6 +85,8 @@ export interface DataEntity {
   endDate?: string;
   totalDebts: number;
   totalAssets: number;
+  netAssets: number;
+  netDebts: number;
   totalTotals: number;
 }
 
@@ -82,6 +103,8 @@ export type IntervalEntity = {
   intervalEndDate?: string;
   totalAssets: number;
   totalDebts: number;
+  netAssets: number;
+  netDebts: number;
   totalTotals: number;
 };
 
@@ -93,6 +116,8 @@ export interface GroupedEntity {
   totalAssets: number;
   totalDebts: number;
   totalTotals: number;
+  netAssets: number;
+  netDebts: number;
   categories?: GroupedEntity[];
 }
 
@@ -113,6 +138,7 @@ export interface CustomReportData {
   show_empty: number;
   show_offbudget: number;
   show_hidden: number;
+  include_current: number;
   show_uncategorized: number;
   selected_categories?: CategoryEntity[];
   graph_type: string;

package/@types/loot-core/types/models/rule.d.ts

@@ -24,7 +24,8 @@ export type RuleConditionOp =
   | 'lt'
   | 'lte'
   | 'contains'
-  | 'doesNotContain';
+  | 'doesNotContain'
+  | 'matches';
 
 export interface RuleConditionEntity {
   field?: string;