@actual-app/api 6.10.0 → 24.10.0

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

@@ -39,7 +39,7 @@ type FinanceModals = {
   };
   'select-linked-accounts': {
     accounts: unknown[];
-    requisitionId: string;
+    requisitionId?: string;
     upgradingAccountId?: string;
     syncSource?: AccountSyncSource;
   };
@@ -54,7 +54,7 @@ type FinanceModals = {
   'manage-rules': { payeeId?: string };
   'edit-rule': {
     rule: RuleEntity | NewRuleEntity;
-    onSave: (rule: RuleEntity) => void;
+    onSave?: (rule: RuleEntity) => void;
   };
   'merge-unused-payees': {
     payeeIds: string[];
@@ -157,7 +157,7 @@ type FinanceModals = {
     onBudgetAction: (month: string, action: string, args?: unknown) => void;
     onClose?: () => void;
   };
-  'rollover-budget-menu': {
+  'envelope-budget-menu': {
     categoryId: string;
     month: string;
     onUpdateBudget: (amount: number) => void;
@@ -165,7 +165,7 @@ type FinanceModals = {
     onSetMonthsAverage: (numberOfMonths: number) => void;
     onApplyBudgetTemplate: () => void;
   };
-  'report-budget-menu': {
+  'tracking-budget-menu': {
     categoryId: string;
     month: string;
     onUpdateBudget: (amount: number) => void;
@@ -187,8 +187,8 @@ type FinanceModals = {
     name: string;
     onSave: (id: string, notes: string) => void;
   };
-  'report-budget-summary': { month: string };
-  'rollover-budget-summary': {
+  'tracking-budget-summary': { month: string };
+  'envelope-budget-summary': {
     month: string;
     onBudgetAction: (
       month: string,
@@ -204,27 +204,28 @@ type FinanceModals = {
     onValidate?: (value: string) => string;
     onSubmit: (value: string) => Promise<void>;
   };
-  'rollover-balance-menu': {
+  'envelope-balance-menu': {
     categoryId: string;
     month: string;
     onCarryover: (carryover: boolean) => void;
     onTransfer: () => void;
     onCover: () => void;
   };
-  'rollover-summary-to-budget-menu': {
+  'envelope-summary-to-budget-menu': {
     month: string;
     onTransfer: () => void;
     onCover: () => void;
     onHoldBuffer: () => void;
     onResetHoldBuffer: () => void;
   };
-  'report-balance-menu': {
+  'tracking-balance-menu': {
     categoryId: string;
     month: string;
     onCarryover: (carryover: boolean) => void;
   };
   transfer: {
     title: string;
+    categoryId?: CategoryEntity['id'];
     month: string;
     amount: number;
     onSubmit: (amount: number, toCategoryId: string) => void;
@@ -232,6 +233,7 @@ type FinanceModals = {
   };
   cover: {
     title: string;
+    categoryId?: CategoryEntity['id'];
     month: string;
     showToBeBudgeted?: boolean;
     onSubmit: (fromCategoryId: string) => void;
@@ -250,12 +252,12 @@ type FinanceModals = {
     onToggleHiddenCategories: () => void;
     onSwitchBudgetFile: () => void;
   };
-  'rollover-budget-month-menu': {
+  'envelope-budget-month-menu': {
     month: string;
     onBudgetAction: (month: string, action: string, arg?: unknown) => void;
     onEditNotes: (month: string) => void;
   };
-  'report-budget-month-menu': {
+  'tracking-budget-month-menu': {
     month: string;
     onBudgetAction: (month: string, action: string, arg?: unknown) => void;
     onEditNotes: (month: string) => void;
@@ -270,6 +272,10 @@ type FinanceModals = {
     message?: string;
     onConfirm: () => void;
   };
+  'confirm-unlink-account': {
+    accountName: string;
+    onUnlink: () => void;
+  };
 };
 
 export type PushModalAction = {

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

@@ -1,25 +1,20 @@
-import type {
-  GlobalPrefs,
-  LocalPrefs,
-  MetadataPrefs,
-  SyncedPrefs,
-} from '../../types/prefs';
+import type { GlobalPrefs, MetadataPrefs } from '../../types/prefs';
 import type * as constants from '../constants';
 
 export type PrefsState = {
-  local: LocalPrefs & MetadataPrefs & SyncedPrefs;
+  local: MetadataPrefs;
   global: GlobalPrefs;
 };
 
 export type SetPrefsAction = {
   type: typeof constants.SET_PREFS;
-  prefs: LocalPrefs & MetadataPrefs & SyncedPrefs;
+  prefs: MetadataPrefs;
   globalPrefs: GlobalPrefs;
 };
 
 export type MergeLocalPrefsAction = {
   type: typeof constants.MERGE_LOCAL_PREFS;
-  prefs: LocalPrefs & MetadataPrefs & SyncedPrefs;
+  prefs: MetadataPrefs;
 };
 
 export type MergeGlobalPrefsAction = {

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

@@ -3,8 +3,8 @@ import { type AccountEntity } from '../../types/models';
 import type * as constants from '../constants';
 
 export type QueriesState = {
-  newTransactions: unknown[];
-  matchedTransactions: unknown[];
+  newTransactions: string[];
+  matchedTransactions: string[];
   lastTransaction: unknown | null;
   updatedAccounts: string[];
   accounts: AccountEntity[];
@@ -20,8 +20,8 @@ export type QueriesState = {
 
 type SetNewTransactionsAction = {
   type: typeof constants.SET_NEW_TRANSACTIONS;
-  newTransactions?: unknown[];
-  matchedTransactions?: unknown[];
+  newTransactions?: string[];
+  matchedTransactions?: string[];
   updatedAccounts?: string[];
 };
 

package/@types/loot-core/mocks/index.d.ts

@@ -1,12 +1,7 @@
-export declare function generateAccount(name: any, isConnected: any, offbudget: any): {
-    id: string;
-    name: any;
-    balance_current: number;
-    bank: number;
+import type { AccountEntity } from '../types/models';
+export declare function generateAccount(name: any, isConnected: any, offbudget: any): AccountEntity & {
     bankId: number;
     bankName: string;
-    offbudget: number;
-    closed: number;
 };
 export declare function generateCategory(name: any, group: any, isIncome?: boolean): {
     id: string;

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

@@ -10,7 +10,7 @@ export declare class Condition {
     type: any;
     unparsedValue: any;
     value: any;
-    constructor(op: any, field: any, value: any, options: any, fieldTypes: any);
+    constructor(op: any, field: any, value: any, options: any);
     eval(object: any): any;
     getValue(): any;
     serialize(): {
@@ -30,7 +30,7 @@ export declare class Action {
     rawValue: any;
     type: any;
     value: any;
-    constructor(op: ActionOperator, field: any, value: any, options: any, fieldTypes: any);
+    constructor(op: ActionOperator, field: any, value: any, options: any);
     exec(object: any): void;
     serialize(): {
         options: any;
@@ -47,13 +47,12 @@ export declare class Rule {
     conditionsOp: any;
     id: any;
     stage: any;
-    constructor({ id, stage, conditionsOp, conditions, actions, fieldTypes, }: {
+    constructor({ id, stage, conditionsOp, conditions, actions, }: {
         id?: string;
         stage?: any;
         conditionsOp: any;
         conditions: any;
         actions: any;
-        fieldTypes: any;
     });
     evalConditions(object: any): any;
     execActions<T>(object: T): Partial<T>;

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

@@ -223,6 +223,14 @@ export declare const schema: {
             type: string;
         };
     };
+    preferences: {
+        id: {
+            type: string;
+        };
+        value: {
+            type: string;
+        };
+    };
     transaction_filters: {
         id: {
             type: string;

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

@@ -67,8 +67,8 @@ export declare function selectWithSchema(table: any, sql: any, params: any): Pro
 export declare function selectFirstWithSchema(table: any, sql: any, params: any): Promise<any>;
 export declare function insertWithSchema(table: any, row: any): Promise<any>;
 export declare function updateWithSchema(table: any, fields: any): Promise<void>;
-export declare function getCategories(): Promise<CategoryEntity[]>;
-export declare function getCategoriesGrouped(): Promise<Array<CategoryGroupEntity>>;
+export declare function getCategories(ids?: Array<CategoryEntity['id']>): Promise<CategoryEntity[]>;
+export declare function getCategoriesGrouped(ids?: Array<CategoryGroupEntity['id']>): Promise<Array<CategoryGroupEntity>>;
 export declare function insertCategoryGroup(group: any): Promise<any>;
 export declare function updateCategoryGroup(group: any): Promise<void>;
 export declare function moveCategoryGroup(id: any, targetId: any): Promise<void>;

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 "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/budget-hold-for-next-month" | "api/budget-reset-hold" | "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" | "dashboard-update" | "dashboard-update-widget" | "dashboard-reset" | "dashboard-add-widget" | "dashboard-remove-widget" | "dashboard-import" | "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" | "envelope-budget-month" | "tracking-budget-month" | "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/budget-hold-for-next-month" | "api/budget-reset-hold" | "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" | "dashboard-update" | "dashboard-update-widget" | "dashboard-reset" | "dashboard-add-widget" | "dashboard-remove-widget" | "dashboard-import" | "filter-create" | "filter-update" | "filter-delete" | "notes-save" | "preferences/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/preferences/app.d.ts

@@ -0,0 +1,12 @@
+import { PreferencesHandlers } from './types/handlers';
+export declare const app: {
+    events: any;
+    handlers: PreferencesHandlers;
+    services: any;
+    unlistenServices: any;
+    method<Name extends "preferences/save">(name: Name, func: PreferencesHandlers[Name]): void;
+    service(func: any): void;
+    combine(...apps: any[]): void;
+    startServices(): void;
+    stopServices(): void;
+};

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

@@ -0,0 +1,8 @@
+import { type SyncedPrefs } from '../../../types/prefs';
+
+export interface PreferencesHandlers {
+  'preferences/save': (arg: {
+    id: keyof SyncedPrefs;
+    value: string | undefined;
+  }) => Promise<void>;
+}

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

@@ -1,15 +1,13 @@
-import type { MetadataPrefs, SyncedPrefs } from '../types/prefs';
-type LocalPrefs = MetadataPrefs & Pick<SyncedPrefs, 'budgetType'>;
+import type { MetadataPrefs } from '../types/prefs';
 export declare const BUDGET_TYPES: readonly ["report", "rollover"];
 export type BudgetType = (typeof BUDGET_TYPES)[number];
-export declare function loadPrefs(id?: string): Promise<LocalPrefs>;
-export declare function savePrefs(prefsToSet: LocalPrefs, { avoidSync }?: {
+export declare function loadPrefs(id?: string): Promise<MetadataPrefs>;
+export declare function savePrefs(prefsToSet: MetadataPrefs, { avoidSync }?: {
     avoidSync?: boolean;
 }): Promise<void>;
 export declare function unloadPrefs(): void;
-export declare function getPrefs(): LocalPrefs;
+export declare function getPrefs(): MetadataPrefs;
 export declare function getDefaultPrefs(id: string, budgetName: string): {
     id: string;
     budgetName: string;
 };
-export {};

package/@types/loot-core/server/util/rschedule.d.ts

@@ -1,5 +1,4 @@
 import '@rschedule/standard-date-adapter/setup';
-import '@rschedule/json-tools/Schedule';
 export * from '@rschedule/standard-date-adapter';
 export * from '@rschedule/core';
 export * from '@rschedule/core/generators';

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

@@ -18,5 +18,5 @@ export declare function getBankSyncError(error: {
 export declare class LazyLoadFailedError extends Error {
     type: string;
     meta: {};
-    constructor(name: string);
+    constructor(name: string, cause: unknown);
 }

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

@@ -5,6 +5,8 @@ export declare const parseDate: typeof _parse;
 export declare function yearFromDate(date: DateLike): string;
 export declare function monthFromDate(date: DateLike): string;
 export declare function weekFromDate(date: DateLike, firstDayOfWeekIdx: SyncedPrefs['firstDayOfWeekIdx']): string;
+export declare function firstDayOfMonth(date: DateLike): string;
+export declare function lastDayOfMonth(date: DateLike): string;
 export declare function dayFromDate(date: DateLike): string;
 export declare function currentMonth(): string;
 export declare function currentWeek(firstDayOfWeekIdx?: SyncedPrefs['firstDayOfWeekIdx']): string;

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

@@ -1,34 +1,7 @@
-export declare const TYPE_INFO: {
-    date: {
-        ops: string[];
-        nullable: boolean;
-    };
-    id: {
-        ops: string[];
-        nullable: boolean;
-    };
-    saved: {
-        ops: any[];
-        nullable: boolean;
-    };
-    string: {
-        ops: string[];
-        nullable: boolean;
-    };
-    imported_payee: {
-        ops: string[];
-        nullable: boolean;
-    };
-    number: {
-        ops: string[];
-        nullable: boolean;
-    };
-    boolean: {
-        ops: string[];
-        nullable: boolean;
-    };
-};
-export declare const FIELD_TYPES: Map<string, string>;
+import { FieldValueTypes, RuleConditionOp } from '../types/models';
+export declare const FIELD_TYPES: Map<keyof FieldValueTypes, string>;
+export declare function isValidOp(field: keyof FieldValueTypes, op: RuleConditionOp): boolean;
+export declare function getValidOps(field: keyof FieldValueTypes): any;
 export declare const ALLOCATION_METHODS: {
     'fixed-amount': string;
     'fixed-percent': string;
@@ -52,7 +25,7 @@ export declare function deserializeField(field: any): {
     field: any;
     options?: undefined;
 };
-export declare function getFieldError(type: any): "Invalid date format" | "Value cannot be empty" | "Value must be a number" | "Please choose a valid field for this type of rule" | "Internal error, sorry! Please get in touch https://actualbudget.org/contact/ for support";
+export declare function getFieldError(type: any): "Invalid date format" | "Value cannot be empty" | "Value must be a string" | "Value must be a boolean" | "Value must be a number" | "Please choose a valid field for this type of rule" | "Internal error, sorry! Please get in touch https://actualbudget.org/contact/ for support";
 export declare function sortNumbers(num1: any, num2: any): any[];
 export declare function parse(item: any): any;
 export declare function unparse({ error, inputKey, ...item }: {

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

@@ -62,6 +62,8 @@ export declare function makeAsNonChildTransactions(childTransactionsToUpdate: Tr
         tombstone?: boolean;
         schedule?: import("../types/models").ScheduleEntity["id"];
         subtransactions?: TransactionEntity[];
+        _unmatched?: boolean;
+        _deleted?: boolean;
     }[];
 };
 export {};

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

@@ -28,7 +28,9 @@ 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' | 'apostrophe-dot' | 'comma-dot-in';
+declare const NUMBER_FORMATS: readonly ["comma-dot", "dot-comma", "space-comma", "apostrophe-dot", "comma-dot", "comma-dot-in"];
+type NumberFormats = (typeof NUMBER_FORMATS)[number];
+export declare function isNumberFormat(input?: string): input is NumberFormats;
 export declare const numberFormats: Array<{
     value: NumberFormats;
     label: string;
@@ -43,7 +45,7 @@ export declare function getNumberFormat({ format, hideFraction, }?: {
     format?: NumberFormats;
     hideFraction: boolean;
 }): {
-    value: NumberFormats;
+    value: "comma-dot" | "dot-comma" | "space-comma" | "apostrophe-dot" | "comma-dot-in";
     separator: any;
     formatter: Intl.NumberFormat;
     regex: any;

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

@@ -2,6 +2,7 @@ import type { BudgetHandlers } from '../server/budget/types/handlers';
 import type { DashboardHandlers } from '../server/dashboard/types/handlers';
 import type { FiltersHandlers } from '../server/filters/types/handlers';
 import type { NotesHandlers } from '../server/notes/types/handlers';
+import type { PreferencesHandlers } from '../server/preferences/types/handlers';
 import type { ReportsHandlers } from '../server/reports/types/handlers';
 import type { RulesHandlers } from '../server/rules/types/handlers';
 import type { SchedulesHandlers } from '../server/schedules/types/handlers';
@@ -17,6 +18,7 @@ export interface Handlers
     DashboardHandlers,
     FiltersHandlers,
     NotesHandlers,
+    PreferencesHandlers,
     ReportsHandlers,
     RulesHandlers,
     SchedulesHandlers,

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

@@ -1,4 +1,11 @@
 import { type CustomReportEntity } from './reports';
+import { type RuleConditionEntity } from './rule';
+
+export type TimeFrame = {
+  start: string;
+  end: string;
+  mode: 'sliding-window' | 'static' | 'full';
+};
 
 type AbstractWidget<
   T extends string,
@@ -16,22 +23,48 @@ type AbstractWidget<
 
 export type NetWorthWidget = AbstractWidget<
   'net-worth-card',
-  { name?: string } | null
+  {
+    name?: string;
+    conditions?: RuleConditionEntity[];
+    conditionsOp?: 'and' | 'or';
+    timeFrame?: TimeFrame;
+  } | null
 >;
 export type CashFlowWidget = AbstractWidget<
   'cash-flow-card',
-  { name?: string } | null
+  {
+    name?: string;
+    conditions?: RuleConditionEntity[];
+    conditionsOp?: 'and' | 'or';
+    timeFrame?: TimeFrame;
+  } | null
 >;
 export type SpendingWidget = AbstractWidget<
   'spending-card',
-  { name?: string } | null
+  {
+    name?: string;
+    conditions?: RuleConditionEntity[];
+    conditionsOp?: 'and' | 'or';
+    compare?: string;
+    compareTo?: string;
+    isLive?: boolean;
+    mode?: 'single-month' | 'budget' | 'average';
+  } | null
 >;
 export type CustomReportWidget = AbstractWidget<
   'custom-report',
   { id: string }
 >;
+export type MarkdownWidget = AbstractWidget<
+  'markdown-card',
+  { content: string; text_align?: 'left' | 'right' | 'center' }
+>;
 
-type SpecializedWidget = NetWorthWidget | CashFlowWidget | SpendingWidget;
+type SpecializedWidget =
+  | NetWorthWidget
+  | CashFlowWidget
+  | SpendingWidget
+  | MarkdownWidget;
 export type Widget = SpecializedWidget | CustomReportWidget;
 export type NewWidget = Omit<Widget, 'id' | 'tombstone'>;
 

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

@@ -30,14 +30,6 @@ export type balanceTypeOpType =
   | 'netAssets'
   | 'netDebts';
 
-export type spendingReportTimeType =
-  | 'average'
-  | 'thisMonth'
-  | 'lastMonth'
-  | 'twoMonthsPrevious'
-  | 'lastYear'
-  | 'lastYearPrevious';
-
 export type SpendingMonthEntity = Record<
   string | number,
   {
@@ -61,11 +53,9 @@ export interface SpendingEntity {
     months: SpendingMonthEntity;
     day: string;
     average: number;
-    thisMonth: number;
-    lastMonth: number;
-    twoMonthsPrevious: number;
-    lastYear: number;
-    lastYearPrevious: number;
+    compare: number;
+    compareTo: number;
+    budget: number;
   }[];
   startDate?: string;
   endDate?: string;

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

@@ -37,6 +37,8 @@ type FieldValueTypes = {
   payee: string;
   imported_payee: string;
   saved: string;
+  cleared: boolean;
+  reconciled: boolean;
 };
 
 type BaseConditionEntity<
@@ -55,8 +57,9 @@ type BaseConditionEntity<
     year?: boolean;
   };
   conditionsOp?: string;
-  type?: 'id' | 'boolean' | 'date' | 'number';
+  type?: 'id' | 'boolean' | 'date' | 'number' | 'string';
   customName?: string;
+  queryFilter?: Record<string, { $oneof: string[] }>;
 };
 
 export type RuleConditionEntity =

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

@@ -2,6 +2,23 @@ import type { AccountEntity } from './account';
 import type { PayeeEntity } from './payee';
 import type { RuleEntity } from './rule';
 
+export interface RecurPattern {
+  value: number;
+  type: 'SU' | 'MO' | 'TU' | 'WE' | 'TH' | 'FR' | 'SA' | 'day';
+}
+
+export interface RecurConfig {
+  frequency: 'daily' | 'weekly' | 'monthly' | 'yearly';
+  interval: number;
+  patterns?: RecurPattern[];
+  skipWeekend?: boolean;
+  start: string;
+  endMode: 'never' | 'after_n_occurrences' | 'on_date';
+  endOccurrences?: number;
+  endDate?: string;
+  weekendSolveMode?: 'before' | 'after';
+}
+
 export interface ScheduleEntity {
   id: string;
   name?: string;
@@ -17,20 +34,7 @@ export interface ScheduleEntity {
   _account: AccountEntity['id'];
   _amount: unknown;
   _amountOp: string;
-  _date: {
-    interval: number;
-    patterns: {
-      value: number;
-      type: 'SU' | 'MO' | 'TU' | 'WE' | 'TH' | 'FR' | 'SA' | 'day';
-    }[];
-    skipWeekend: boolean;
-    start: string;
-    endMode: 'never' | 'after_n_occurrences' | 'on_date';
-    endOccurrences: number;
-    endDate: string;
-    weekendSolveMode: 'before' | 'after';
-    frequency: 'daily' | 'weekly' | 'monthly' | 'yearly';
-  };
+  _date: RecurConfig;
   _conditions: unknown;
   _actions: unknown;
 }

package/@types/loot-core/types/models/transaction-filter.d.ts

@@ -1,7 +1,9 @@
+import { type RuleConditionEntity } from './rule';
+
 export interface TransactionFilterEntity {
   id: string;
   name: string;
-  conditions_op: string;
-  conditions: unknown;
+  conditionsOp: 'and' | 'or';
+  conditions: RuleConditionEntity[];
   tombstone: boolean;
 }

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

@@ -24,4 +24,6 @@ export interface TransactionEntity {
   tombstone?: boolean;
   schedule?: ScheduleEntity['id'];
   subtransactions?: TransactionEntity[];
+  _unmatched?: boolean;
+  _deleted?: boolean;
 }