Skip to content

A local-first personal finance app

lint: patch typescript ignored issues (#6450)

Matiss Janis Aboltins4fc00ae7f11d
diff --git a/.oxlintrc.json b/.oxlintrc.json
index f2bc158bc7..b401efbf44 100644
--- a/.oxlintrc.json
+++ b/.oxlintrc.json
@@ -395,33 +395,6 @@
}
},
// TODO: enable these
- {
- "files": [
- "packages/api/**",
- "packages/component-library/**",
- "packages/crdt/**",
- "packages/desktop-electron/**",
- "packages/desktop-client/vite.config.mts",
- "packages/loot-core/**",
- "packages/sync-server/**"
- ],
- "rules": {
- "typescript/consistent-type-imports": "off"
- }
- },
- {
- "files": [
- "packages/api/**",
- "packages/component-library/**",
- "packages/loot-core/src/server/**",
- "packages/loot-core/src/types/**",
- "packages/sync-server/**",
- "packages/loot-core/typings/window.ts"
- ],
- "rules": {
- "typescript/consistent-type-definitions": "off"
- }
- },
{
"files": [
"packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetMonthMenu.tsx",
diff --git a/packages/api/methods.ts b/packages/api/methods.ts
index a2f1ca3a47..cbfa1499ad 100644
--- a/packages/api/methods.ts
+++ b/packages/api/methods.ts
@@ -125,10 +125,10 @@ export function addTransactions(
});
}
-export interface ImportTransactionsOpts {
+export type ImportTransactionsOpts = {
defaultCleared?: boolean;
dryRun?: boolean;
-}
+};
export function importTransactions(
accountId: APIAccountEntity['id'],
diff --git a/packages/component-library/src/ColorPicker.tsx b/packages/component-library/src/ColorPicker.tsx
index 0c020037a8..e85ddf9928 100644
--- a/packages/component-library/src/ColorPicker.tsx
+++ b/packages/component-library/src/ColorPicker.tsx
@@ -1,11 +1,11 @@
-import { ChangeEvent, ReactNode } from 'react';
+import { type ChangeEvent, type ReactNode } from 'react';
import {
ColorPicker as AriaColorPicker,
- ColorPickerProps as AriaColorPickerProps,
+ type ColorPickerProps as AriaColorPickerProps,
Dialog,
DialogTrigger,
ColorSwatch as AriaColorSwatch,
- ColorSwatchProps,
+ type ColorSwatchProps,
ColorSwatchPicker as AriaColorSwatchPicker,
ColorSwatchPickerItem,
ColorField,
@@ -56,10 +56,10 @@ const DEFAULT_COLOR_SET = [
'#455A64',
];
-interface ColorSwatchPickerProps {
+type ColorSwatchPickerProps = {
columns?: number;
colorset?: string[];
-}
+};
function ColorSwatchPicker({
columns = 5,
@@ -123,11 +123,11 @@ function ColorSwatchPicker({
}
const isColor = (value: string) => /^#[0-9a-fA-F]{6}$/.test(value);
-interface ColorPickerProps extends AriaColorPickerProps {
+type ColorPickerProps = {
children?: ReactNode;
columns?: number;
colorset?: string[];
-}
+} & AriaColorPickerProps;
export function ColorPicker({
children,
diff --git a/packages/component-library/src/InitialFocus.ts b/packages/component-library/src/InitialFocus.ts
index ff8f182419..b969fb77a6 100644
--- a/packages/component-library/src/InitialFocus.ts
+++ b/packages/component-library/src/InitialFocus.ts
@@ -3,8 +3,8 @@ import {
cloneElement,
isValidElement,
type ReactElement,
- Ref,
- RefObject,
+ type Ref,
+ type RefObject,
useEffect,
useRef,
} from 'react';
diff --git a/packages/component-library/src/InitialFocus.web.test.tsx b/packages/component-library/src/InitialFocus.web.test.tsx
index 3ce1df74f8..b316431c4e 100644
--- a/packages/component-library/src/InitialFocus.web.test.tsx
+++ b/packages/component-library/src/InitialFocus.web.test.tsx
@@ -1,5 +1,5 @@
import * as React from 'react';
-import { forwardRef, Ref } from 'react';
+import { forwardRef, type Ref } from 'react';
import { render } from '@testing-library/react';
diff --git a/packages/component-library/src/Input.tsx b/packages/component-library/src/Input.tsx
index 4b9d9fad0d..16e9f93964 100644
--- a/packages/component-library/src/Input.tsx
+++ b/packages/component-library/src/Input.tsx
@@ -1,6 +1,6 @@
import React, {
- ChangeEvent,
- ComponentPropsWithRef,
+ type ChangeEvent,
+ type ComponentPropsWithRef,
type KeyboardEvent,
type FocusEvent,
} from 'react';
diff --git a/packages/crdt/src/crdt/merkle.ts b/packages/crdt/src/crdt/merkle.ts
index 36a15167b6..a3451f5c00 100644
--- a/packages/crdt/src/crdt/merkle.ts
+++ b/packages/crdt/src/crdt/merkle.ts
@@ -7,7 +7,7 @@
// * Need to check to make sure if account exists when handling
// * transaction changes in syncing
-import { Timestamp } from './timestamp';
+import { type Timestamp } from './timestamp';
/**
* Represents a node within a trinary radix trie.
diff --git a/packages/crdt/src/crdt/timestamp.ts b/packages/crdt/src/crdt/timestamp.ts
index c9af7941b9..5e53756d79 100644
--- a/packages/crdt/src/crdt/timestamp.ts
+++ b/packages/crdt/src/crdt/timestamp.ts
@@ -1,7 +1,7 @@
import murmurhash from 'murmurhash';
import { v4 as uuidv4 } from 'uuid';
-import { TrieNode } from './merkle';
+import { type TrieNode } from './merkle';
/**
* Hybrid Unique Logical Clock (HULC) timestamp generator
diff --git a/packages/desktop-client/src/components/budget/goals/reducer.ts b/packages/desktop-client/src/components/budget/goals/reducer.ts
index 2d647d2274..0fd5686674 100644
--- a/packages/desktop-client/src/components/budget/goals/reducer.ts
+++ b/packages/desktop-client/src/components/budget/goals/reducer.ts
@@ -6,7 +6,10 @@ import { type ReducerState, type DisplayTemplateType } from './constants';
export const DEFAULT_PRIORITY = 1;
export const getInitialState = (template: Template | null): ReducerState => {
- const type = template?.type;
+ if (!template) {
+ throw new Error('Template cannot be null');
+ }
+ const type = template.type;
switch (type) {
case 'simple':
return {
diff --git a/packages/desktop-client/vite.config.mts b/packages/desktop-client/vite.config.mts
index 0ec6629756..29b611ad80 100644
--- a/packages/desktop-client/vite.config.mts
+++ b/packages/desktop-client/vite.config.mts
@@ -5,7 +5,7 @@ import basicSsl from '@vitejs/plugin-basic-ssl';
import react from '@vitejs/plugin-react';
import { visualizer } from 'rollup-plugin-visualizer';
/// <reference types="vitest" />
-import { defineConfig, loadEnv, Plugin, type UserConfig } from 'vite';
+import { defineConfig, loadEnv, type Plugin, type UserConfig } from 'vite';
import { VitePWA } from 'vite-plugin-pwa';
import viteTsconfigPaths from 'vite-tsconfig-paths';
diff --git a/packages/desktop-electron/beforePackHook.ts b/packages/desktop-electron/beforePackHook.ts
index 3da026b997..5dc1075d84 100644
--- a/packages/desktop-electron/beforePackHook.ts
+++ b/packages/desktop-electron/beforePackHook.ts
@@ -1,6 +1,6 @@
import { rebuild } from '@electron/rebuild';
import copyFiles from 'copyfiles';
-import { Arch, AfterPackContext } from 'electron-builder';
+import { Arch, type AfterPackContext } from 'electron-builder';
/* The beforePackHook runs before packing the Electron app for an architecture
We hook in here to build anything architecture dependent - such as beter-sqlite3
diff --git a/packages/desktop-electron/e2e/fixtures.ts b/packages/desktop-electron/e2e/fixtures.ts
index 9ad72752dc..e3bce97b5c 100644
--- a/packages/desktop-electron/e2e/fixtures.ts
+++ b/packages/desktop-electron/e2e/fixtures.ts
@@ -4,9 +4,9 @@ import path from 'node:path';
import {
test as base,
_electron,
- Page,
- ElectronApplication,
- TestInfo,
+ type Page,
+ type ElectronApplication,
+ type TestInfo,
} from '@playwright/test';
import { remove, ensureDir } from 'fs-extra';
diff --git a/packages/desktop-electron/index.ts b/packages/desktop-electron/index.ts
index 16cd3fe881..8cbb29c3fd 100644
--- a/packages/desktop-electron/index.ts
+++ b/packages/desktop-electron/index.ts
@@ -1,5 +1,5 @@
import fs from 'fs';
-import { createServer, Server } from 'http';
+import { createServer, type Server } from 'http';
import path from 'path';
import {
@@ -13,11 +13,11 @@ import {
powerMonitor,
protocol,
utilityProcess,
- UtilityProcess,
- OpenDialogSyncOptions,
- SaveDialogOptions,
- Env,
- ForkOptions,
+ type UtilityProcess,
+ type OpenDialogSyncOptions,
+ type SaveDialogOptions,
+ type Env,
+ type ForkOptions,
} from 'electron';
import { copy, exists, mkdir, remove } from 'fs-extra';
import promiseRetry from 'promise-retry';
diff --git a/packages/desktop-electron/menu.ts b/packages/desktop-electron/menu.ts
index e40043899b..253115fda4 100644
--- a/packages/desktop-electron/menu.ts
+++ b/packages/desktop-electron/menu.ts
@@ -1,4 +1,9 @@
-import { MenuItemConstructorOptions, Menu, BrowserWindow, app } from 'electron';
+import {
+ type MenuItemConstructorOptions,
+ Menu,
+ type BrowserWindow,
+ app,
+} from 'electron';
export function getMenu() {
const template: MenuItemConstructorOptions[] = [
diff --git a/packages/desktop-electron/preload.ts b/packages/desktop-electron/preload.ts
index 7dd31303dc..b6f4b66f84 100644
--- a/packages/desktop-electron/preload.ts
+++ b/packages/desktop-electron/preload.ts
@@ -1,9 +1,9 @@
-import { ipcRenderer, contextBridge, IpcRenderer } from 'electron';
+import { ipcRenderer, contextBridge, type IpcRenderer } from 'electron';
import {
- GetBootstrapDataPayload,
- OpenFileDialogPayload,
- SaveFileDialogPayload,
+ type GetBootstrapDataPayload,
+ type OpenFileDialogPayload,
+ type SaveFileDialogPayload,
} from './index';
const { version: VERSION, isDev: IS_DEV }: GetBootstrapDataPayload =
diff --git a/packages/desktop-electron/window-state.ts b/packages/desktop-electron/window-state.ts
index c92ba0df93..a31bfe23a3 100644
--- a/packages/desktop-electron/window-state.ts
+++ b/packages/desktop-electron/window-state.ts
@@ -1,7 +1,7 @@
import fs from 'fs';
import path from 'path';
-import electron, { BrowserWindow } from 'electron';
+import electron, { type BrowserWindow } from 'electron';
type WindowState = Electron.Rectangle & {
isMaximized?: boolean;
diff --git a/packages/loot-core/src/mocks/budget.ts b/packages/loot-core/src/mocks/budget.ts
index a619158c93..b4aa67945a 100644
--- a/packages/loot-core/src/mocks/budget.ts
+++ b/packages/loot-core/src/mocks/budget.ts
@@ -20,7 +20,7 @@ import type {
import { random } from './random';
-import { CategoryGroupDefinition } from '.';
+import { type CategoryGroupDefinition } from '.';
type MockPayeeEntity = Partial<PayeeEntity> & { bill?: boolean };
diff --git a/packages/loot-core/src/mocks/setup.ts b/packages/loot-core/src/mocks/setup.ts
index 0aa30d6e1b..b2b8b9198c 100644
--- a/packages/loot-core/src/mocks/setup.ts
+++ b/packages/loot-core/src/mocks/setup.ts
@@ -4,7 +4,7 @@ import * as nativeFs from 'fs';
import * as fetchClient from '../platform/client/fetch';
import * as sqlite from '../platform/server/sqlite';
import * as db from '../server/db';
-import * as MigrationsType from '../server/migrate/migrations';
+import type * as MigrationsType from '../server/migrate/migrations';
import {
enableGlobalMutations,
disableGlobalMutations,
diff --git a/packages/loot-core/src/platform/client/undo/index.ts b/packages/loot-core/src/platform/client/undo/index.ts
index 122385d511..0792c47909 100644
--- a/packages/loot-core/src/platform/client/undo/index.ts
+++ b/packages/loot-core/src/platform/client/undo/index.ts
@@ -1,9 +1,9 @@
// This is temporary until we move all loot-core/client over to desktop-client.
// oxlint-disable-next-line eslint/no-restricted-imports
-import { Modal } from '@actual-app/web/src/modals/modalsSlice';
+import { type Modal } from '@actual-app/web/src/modals/modalsSlice';
import { v4 as uuidv4 } from 'uuid';
-import { UndoState as ServerUndoState } from '../../../server/undo';
+import { type UndoState as ServerUndoState } from '../../../server/undo';
type UndoState = {
url: string | null;
diff --git a/packages/loot-core/src/platform/server/asyncStorage/__mocks__/index.ts b/packages/loot-core/src/platform/server/asyncStorage/__mocks__/index.ts
index 5bc11504f5..5faf8d9f38 100644
--- a/packages/loot-core/src/platform/server/asyncStorage/__mocks__/index.ts
+++ b/packages/loot-core/src/platform/server/asyncStorage/__mocks__/index.ts
@@ -1,6 +1,6 @@
// @ts-strict-ignore
-import { GlobalPrefsJson } from '../../../../types/prefs';
-import * as T from '../index-types';
+import { type GlobalPrefsJson } from '../../../../types/prefs';
+import type * as T from '../index-types';
const store: GlobalPrefsJson = {};
diff --git a/packages/loot-core/src/platform/server/asyncStorage/index.electron.ts b/packages/loot-core/src/platform/server/asyncStorage/index.electron.ts
index 7cc7145cdf..f612dcf7a9 100644
--- a/packages/loot-core/src/platform/server/asyncStorage/index.electron.ts
+++ b/packages/loot-core/src/platform/server/asyncStorage/index.electron.ts
@@ -2,10 +2,10 @@
import * as fs from 'fs';
import { join } from 'path';
-import { GlobalPrefsJson } from '../../../types/prefs';
+import { type GlobalPrefsJson } from '../../../types/prefs';
import * as lootFs from '../fs';
-import * as T from './index-types';
+import type * as T from './index-types';
const getStorePath = () => join(lootFs.getDataDir(), 'global-store.json');
let store: GlobalPrefsJson;
diff --git a/packages/loot-core/src/platform/server/asyncStorage/index.ts b/packages/loot-core/src/platform/server/asyncStorage/index.ts
index a0d8176efc..50e8afdd51 100644
--- a/packages/loot-core/src/platform/server/asyncStorage/index.ts
+++ b/packages/loot-core/src/platform/server/asyncStorage/index.ts
@@ -1,8 +1,8 @@
// @ts-strict-ignore
-import { GlobalPrefsJson } from '../../../types/prefs';
+import { type GlobalPrefsJson } from '../../../types/prefs';
import { getDatabase } from '../indexeddb';
-import * as T from './index-types';
+import type * as T from './index-types';
export const init: T.Init = function () {};
diff --git a/packages/loot-core/src/platform/server/fs/index.web.ts b/packages/loot-core/src/platform/server/fs/index.web.ts
index 83bd4bf98b..a11728030a 100644
--- a/packages/loot-core/src/platform/server/fs/index.web.ts
+++ b/packages/loot-core/src/platform/server/fs/index.web.ts
@@ -4,7 +4,7 @@ import IndexedDBBackend from 'absurd-sql/dist/indexeddb-backend';
import * as connection from '../connection';
import * as idb from '../indexeddb';
-import { _getModule, SqlJsModule } from '../sqlite';
+import { _getModule, type SqlJsModule } from '../sqlite';
import { join } from './path-join';
diff --git a/packages/loot-core/src/server/accounts/app.ts b/packages/loot-core/src/server/accounts/app.ts
index e12c12a231..3bc454048b 100644
--- a/packages/loot-core/src/server/accounts/app.ts
+++ b/packages/loot-core/src/server/accounts/app.ts
@@ -10,14 +10,14 @@ import { dayFromDate } from '../../shared/months';
import * as monthUtils from '../../shared/months';
import { amountToInteger } from '../../shared/util';
import {
- AccountEntity,
- CategoryEntity,
- SyncServerGoCardlessAccount,
- TransactionEntity,
- SyncServerSimpleFinAccount,
- SyncServerPluggyAiAccount,
+ type AccountEntity,
+ type CategoryEntity,
+ type SyncServerGoCardlessAccount,
+ type TransactionEntity,
+ type SyncServerSimpleFinAccount,
+ type SyncServerPluggyAiAccount,
type GoCardlessToken,
- ImportTransactionEntity,
+ type ImportTransactionEntity,
} from '../../types/models';
import { createApp } from '../app';
import * as db from '../db';
diff --git a/packages/loot-core/src/server/accounts/sync.test.ts b/packages/loot-core/src/server/accounts/sync.test.ts
index e07bba4b94..837fcd37c9 100644
--- a/packages/loot-core/src/server/accounts/sync.test.ts
+++ b/packages/loot-core/src/server/accounts/sync.test.ts
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import * as monthUtils from '../../shared/months';
-import { SyncedPrefs } from '../../types/prefs';
+import { type SyncedPrefs } from '../../types/prefs';
import * as db from '../db';
import { loadMappings } from '../db/mappings';
import { post } from '../post';
diff --git a/packages/loot-core/src/server/accounts/sync.ts b/packages/loot-core/src/server/accounts/sync.ts
index 22cbf82216..22bc76f3cd 100644
--- a/packages/loot-core/src/server/accounts/sync.ts
+++ b/packages/loot-core/src/server/accounts/sync.ts
@@ -16,10 +16,10 @@ import {
integerToAmount,
} from '../../shared/util';
import {
- AccountEntity,
- BankSyncResponse,
- SimpleFinBatchSyncResponse,
- TransactionEntity,
+ type AccountEntity,
+ type BankSyncResponse,
+ type SimpleFinBatchSyncResponse,
+ type TransactionEntity,
} from '../../types/models';
import { aqlQuery } from '../aql';
import * as db from '../db';
diff --git a/packages/loot-core/src/server/admin/app.ts b/packages/loot-core/src/server/admin/app.ts
index 6dc51dde97..3cb043f532 100644
--- a/packages/loot-core/src/server/admin/app.ts
+++ b/packages/loot-core/src/server/admin/app.ts
@@ -1,9 +1,9 @@
// @ts-strict-ignore
import * as asyncStorage from '../../platform/server/asyncStorage';
import {
- UserAvailable,
- UserEntity,
- NewUserAccessEntity,
+ type UserAvailable,
+ type UserEntity,
+ type NewUserAccessEntity,
} from '../../types/models';
import { createApp } from '../app';
import { del, get, patch, post } from '../post';
diff --git a/packages/loot-core/src/server/api-models.ts b/packages/loot-core/src/server/api-models.ts
index ea2b0fbb4f..4b8df58dd9 100644
--- a/packages/loot-core/src/server/api-models.ts
+++ b/packages/loot-core/src/server/api-models.ts
@@ -1,4 +1,4 @@
-import { Budget } from '../types/budget';
+import { type Budget } from '../types/budget';
import type {
AccountEntity,
CategoryEntity,
@@ -7,7 +7,7 @@ import type {
ScheduleEntity,
} from '../types/models';
-import { RemoteFile } from './cloud-storage';
+import { type RemoteFile } from './cloud-storage';
import * as models from './models';
export type APIAccountEntity = Pick<AccountEntity, 'id' | 'name'> & {
diff --git a/packages/loot-core/src/server/api.test.ts b/packages/loot-core/src/server/api.test.ts
index 0163e56c87..4be428c47c 100644
--- a/packages/loot-core/src/server/api.test.ts
+++ b/packages/loot-core/src/server/api.test.ts
@@ -1,5 +1,5 @@
import { getBankSyncError } from '../shared/errors';
-import { ServerHandlers } from '../types/server-handlers';
+import { type ServerHandlers } from '../types/server-handlers';
import { installAPI } from './api';
vi.mock('../shared/errors', () => ({
diff --git a/packages/loot-core/src/server/api.ts b/packages/loot-core/src/server/api.ts
index 42ca8d1063..5613d1f71a 100644
--- a/packages/loot-core/src/server/api.ts
+++ b/packages/loot-core/src/server/api.ts
@@ -17,13 +17,13 @@ import {
deleteTransaction,
} from '../shared/transactions';
import { integerToAmount } from '../shared/util';
-import { Handlers } from '../types/handlers';
+import { type Handlers } from '../types/handlers';
import {
- AccountEntity,
- CategoryGroupEntity,
- ScheduleEntity,
+ type AccountEntity,
+ type CategoryGroupEntity,
+ type ScheduleEntity,
} from '../types/models';
-import { ServerHandlers } from '../types/server-handlers';
+import { type ServerHandlers } from '../types/server-handlers';
import { addTransactions } from './accounts/sync';
import {
@@ -34,8 +34,8 @@ import {
payeeModel,
remoteFileModel,
scheduleModel,
- APIScheduleEntity,
- AmountOPType,
+ type APIScheduleEntity,
+ type AmountOPType,
} from './api-models';
import { aqlQuery } from './aql';
import * as cloudStorage from './cloud-storage';
diff --git a/packages/loot-core/src/server/app.ts b/packages/loot-core/src/server/app.ts
index 38a9e01fe1..37b8f0c0bf 100644
--- a/packages/loot-core/src/server/app.ts
+++ b/packages/loot-core/src/server/app.ts
@@ -2,7 +2,7 @@
import mitt, { type Emitter } from 'mitt';
import { captureException } from '../platform/exceptions';
-import { ServerEvents } from '../types/server-events';
+import { type ServerEvents } from '../types/server-events';
// This is a simple helper abstraction for defining methods exposed to
// the client. It doesn't do much, but checks for naming conflicts and
diff --git a/packages/loot-core/src/server/aql/compiler.ts b/packages/loot-core/src/server/aql/compiler.ts
index 5dda25fa37..930a3b60f7 100644
--- a/packages/loot-core/src/server/aql/compiler.ts
+++ b/packages/loot-core/src/server/aql/compiler.ts
@@ -1,5 +1,5 @@
import { getNormalisedString } from '../../shared/normalisation';
-import { QueryState } from '../../shared/query';
+import { type QueryState } from '../../shared/query';
// @ts-strict-ignore
let _uid = 0;
diff --git a/packages/loot-core/src/server/aql/exec.ts b/packages/loot-core/src/server/aql/exec.ts
index 2aa122a36f..a83b397659 100644
--- a/packages/loot-core/src/server/aql/exec.ts
+++ b/packages/loot-core/src/server/aql/exec.ts
@@ -1,14 +1,14 @@
// @ts-strict-ignore
-import { QueryState } from '../../shared/query';
+import { type QueryState } from '../../shared/query';
import * as db from '../db';
import {
compileQuery,
- CompilerState,
+ type CompilerState,
defaultConstructQuery,
- OutputTypes,
- SchemaConfig,
- SqlPieces,
+ type OutputTypes,
+ type SchemaConfig,
+ type SqlPieces,
} from './compiler';
import { convertInputType, convertOutputType } from './schema-helpers';
diff --git a/packages/loot-core/src/server/aql/index.ts b/packages/loot-core/src/server/aql/index.ts
index 47af3d926b..dd3fde0183 100644
--- a/packages/loot-core/src/server/aql/index.ts
+++ b/packages/loot-core/src/server/aql/index.ts
@@ -1,8 +1,8 @@
import { Query, type QueryState } from '../../shared/query';
-import { CompilerState, SqlPieces } from './compiler';
+import { type CompilerState, type SqlPieces } from './compiler';
import {
- AqlQueryParams,
+ type AqlQueryParams,
compileAndRunAqlQuery,
runCompiledAqlQuery,
} from './exec';
diff --git a/packages/loot-core/src/server/aql/schema/executors.ts b/packages/loot-core/src/server/aql/schema/executors.ts
index c8fd97b000..4743922f85 100644
--- a/packages/loot-core/src/server/aql/schema/executors.ts
+++ b/packages/loot-core/src/server/aql/schema/executors.ts
@@ -1,17 +1,17 @@
// @ts-strict-ignore
import { aqlQuery } from '..';
-import { q, QueryState } from '../../../shared/query';
-import { CategoryEntity } from '../../../types/models';
+import { q, type QueryState } from '../../../shared/query';
+import { type CategoryEntity } from '../../../types/models';
import * as db from '../../db';
import { whereIn } from '../../db/util';
import {
- CompilerState,
+ type CompilerState,
isAggregateQuery,
- OutputTypes,
- SqlPieces,
+ type OutputTypes,
+ type SqlPieces,
} from '../compiler';
-import { AqlQueryExecutor, execQuery } from '../exec';
+import { type AqlQueryExecutor, execQuery } from '../exec';
import { convertOutputType } from '../schema-helpers';
// Transactions executor
diff --git a/packages/loot-core/src/server/aql/schema/index.ts b/packages/loot-core/src/server/aql/schema/index.ts
index 83b4062c13..1aaf1c8b88 100644
--- a/packages/loot-core/src/server/aql/schema/index.ts
+++ b/packages/loot-core/src/server/aql/schema/index.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { SchemaConfig } from '../compiler';
+import { type SchemaConfig } from '../compiler';
function f(type: string, opts?: Record<string, unknown>) {
return { type, ...opts };
diff --git a/packages/loot-core/src/server/auth/app.ts b/packages/loot-core/src/server/auth/app.ts
index bb915382a9..214643505c 100644
--- a/packages/loot-core/src/server/auth/app.ts
+++ b/packages/loot-core/src/server/auth/app.ts
@@ -1,6 +1,6 @@
import * as asyncStorage from '../../platform/server/asyncStorage';
import { logger } from '../../platform/server/log';
-import { OpenIdConfig } from '../../types/models';
+import { type OpenIdConfig } from '../../types/models';
import { createApp } from '../app';
import * as encryption from '../encryption';
import { PostError } from '../errors';
diff --git a/packages/loot-core/src/server/budget/actions.ts b/packages/loot-core/src/server/budget/actions.ts
index 440390d422..e1c27b17ed 100644
--- a/packages/loot-core/src/server/budget/actions.ts
+++ b/packages/loot-core/src/server/budget/actions.ts
@@ -6,11 +6,11 @@ import * as asyncStorage from '../../platform/server/asyncStorage';
import { getLocale } from '../../shared/locale';
import * as monthUtils from '../../shared/months';
import {
- IntegerAmount,
+ type IntegerAmount,
integerToCurrency,
safeNumber,
} from '../../shared/util';
-import { CategoryEntity } from '../../types/models';
+import { type CategoryEntity } from '../../types/models';
import * as db from '../db';
import * as sheet from '../sheet';
import { batchMessages } from '../sync';
diff --git a/packages/loot-core/src/server/budget/app.ts b/packages/loot-core/src/server/budget/app.ts
index c6583b6fb2..f3b610a87e 100644
--- a/packages/loot-core/src/server/budget/app.ts
+++ b/packages/loot-core/src/server/budget/app.ts
@@ -1,6 +1,9 @@
import * as monthUtils from '../../shared/months';
import { q } from '../../shared/query';
-import { CategoryEntity, CategoryGroupEntity } from '../../types/models';
+import {
+ type CategoryEntity,
+ type CategoryGroupEntity,
+} from '../../types/models';
import { createApp } from '../app';
import { aqlQuery } from '../aql';
import * as db from '../db';
@@ -18,7 +21,7 @@ import * as cleanupActions from './cleanup-template';
import * as goalActions from './goal-template';
import * as goalNoteActions from './template-notes';
-export interface BudgetHandlers {
+export type BudgetHandlers = {
'budget/budget-amount': typeof actions.setBudget;
'budget/copy-previous-month': typeof actions.copyPreviousMonth;
'budget/copy-single-month': typeof actions.copySinglePreviousMonth;
@@ -59,7 +62,7 @@ export interface BudgetHandlers {
'budget/set-category-automations': typeof goalActions.storeTemplates;
'budget/store-note-templates': typeof goalNoteActions.storeNoteTemplates;
'budget/render-note-templates': typeof goalNoteActions.unparse;
-}
+};
export const app = createApp<BudgetHandlers>();
diff --git a/packages/loot-core/src/server/budget/base.ts b/packages/loot-core/src/server/budget/base.ts
index 849db3dcbd..9e86d36b38 100644
--- a/packages/loot-core/src/server/budget/base.ts
+++ b/packages/loot-core/src/server/budget/base.ts
@@ -2,7 +2,7 @@
import * as monthUtils from '../../shared/months';
import { q } from '../../shared/query';
import { getChangedValues } from '../../shared/util';
-import { CategoryGroupEntity } from '../../types/models';
+import { type CategoryGroupEntity } from '../../types/models';
import { aqlQuery } from '../aql';
import * as db from '../db';
import * as sheet from '../sheet';
diff --git a/packages/loot-core/src/server/budget/category-template-context.ts b/packages/loot-core/src/server/budget/category-template-context.ts
index 2af6a75937..a3b490c667 100644
--- a/packages/loot-core/src/server/budget/category-template-context.ts
+++ b/packages/loot-core/src/server/budget/category-template-context.ts
@@ -1,21 +1,21 @@
// @ts-strict-ignore
-import { Currency, getCurrency } from 'loot-core/shared/currencies';
+import { type Currency, getCurrency } from 'loot-core/shared/currencies';
import { q } from 'loot-core/shared/query';
import * as monthUtils from '../../shared/months';
import { amountToInteger, integerToAmount } from '../../shared/util';
-import { CategoryEntity } from '../../types/models';
+import { type CategoryEntity } from '../../types/models';
import {
- AverageTemplate,
- ByTemplate,
- CopyTemplate,
- GoalTemplate,
- PercentageTemplate,
- RemainderTemplate,
- SimpleTemplate,
- SpendTemplate,
- Template,
- PeriodicTemplate,
+ type AverageTemplate,
+ type ByTemplate,
+ type CopyTemplate,
+ type GoalTemplate,
+ type PercentageTemplate,
+ type RemainderTemplate,
+ type SimpleTemplate,
+ type SpendTemplate,
+ type Template,
+ type PeriodicTemplate,
} from '../../types/models/templates';
import { aqlQuery } from '../aql';
import * as db from '../db';
diff --git a/packages/loot-core/src/server/budget/goal-template.ts b/packages/loot-core/src/server/budget/goal-template.ts
index 40f839c645..3e143d428b 100644
--- a/packages/loot-core/src/server/budget/goal-template.ts
+++ b/packages/loot-core/src/server/budget/goal-template.ts
@@ -1,8 +1,11 @@
// @ts-strict-ignore
import * as monthUtils from '../../shared/months';
import { q } from '../../shared/query';
-import { CategoryEntity, CategoryGroupEntity } from '../../types/models';
-import { Template } from '../../types/models/templates';
+import {
+ type CategoryEntity,
+ type CategoryGroupEntity,
+} from '../../types/models';
+import { type Template } from '../../types/models/templates';
import { aqlQuery } from '../aql';
import * as db from '../db';
import { batchMessages } from '../sync';
diff --git a/packages/loot-core/src/server/budget/schedule-template.test.ts b/packages/loot-core/src/server/budget/schedule-template.test.ts
index 8cc5d04a4c..0978acc653 100644
--- a/packages/loot-core/src/server/budget/schedule-template.test.ts
+++ b/packages/loot-core/src/server/budget/schedule-template.test.ts
@@ -1,4 +1,4 @@
-import { CategoryEntity } from '../../types/models';
+import { type CategoryEntity } from '../../types/models';
import * as db from '../db';
import { Rule } from '../rules';
import { getRuleForSchedule } from '../schedules/app';
diff --git a/packages/loot-core/src/server/budget/schedule-template.ts b/packages/loot-core/src/server/budget/schedule-template.ts
index 9b3ec30dfe..c4540bd8b2 100644
--- a/packages/loot-core/src/server/budget/schedule-template.ts
+++ b/packages/loot-core/src/server/budget/schedule-template.ts
@@ -5,8 +5,11 @@ import {
getDateWithSkippedWeekend,
extractScheduleConds,
} from '../../shared/schedules';
-import { CategoryEntity } from '../../types/models';
-import { ScheduleTemplate, Template } from '../../types/models/templates';
+import { type CategoryEntity } from '../../types/models';
+import {
+ type ScheduleTemplate,
+ type Template,
+} from '../../types/models/templates';
import * as db from '../db';
import { getRuleForSchedule } from '../schedules/app';
diff --git a/packages/loot-core/src/server/budget/statements.ts b/packages/loot-core/src/server/budget/statements.ts
index fd5963e6a2..730aece4fa 100644
--- a/packages/loot-core/src/server/budget/statements.ts
+++ b/packages/loot-core/src/server/budget/statements.ts
@@ -1,5 +1,5 @@
import * as db from '../db';
-import { DbSchedule } from '../db';
+import { type DbSchedule } from '../db';
import { GOAL_PREFIX, TEMPLATE_PREFIX } from './template-notes';
diff --git a/packages/loot-core/src/server/budget/template-notes.test.ts b/packages/loot-core/src/server/budget/template-notes.test.ts
index 9a1022df0e..518aed0f9a 100644
--- a/packages/loot-core/src/server/budget/template-notes.test.ts
+++ b/packages/loot-core/src/server/budget/template-notes.test.ts
@@ -3,7 +3,7 @@ import * as db from '../db';
import { parse } from './goal-template.pegjs';
import {
- CategoryWithTemplateNote,
+ type CategoryWithTemplateNote,
getActiveSchedules,
getCategoriesWithTemplateNotes,
resetCategoryGoalDefsWithNoTemplates,
diff --git a/packages/loot-core/src/server/budget/template-notes.ts b/packages/loot-core/src/server/budget/template-notes.ts
index b7e0519572..e835471d24 100644
--- a/packages/loot-core/src/server/budget/template-notes.ts
+++ b/packages/loot-core/src/server/budget/template-notes.ts
@@ -3,7 +3,7 @@ import type { Template } from '../../types/models/templates';
import { storeTemplates } from './goal-template';
import { parse } from './goal-template.pegjs';
import {
- CategoryWithTemplateNote,
+ type CategoryWithTemplateNote,
getActiveSchedules,
getCategoriesWithTemplateNotes,
resetCategoryGoalDefsWithNoTemplates,
diff --git a/packages/loot-core/src/server/budgetfiles/app.ts b/packages/loot-core/src/server/budgetfiles/app.ts
index 4e288d5c7d..607c13d0eb 100644
--- a/packages/loot-core/src/server/budgetfiles/app.ts
+++ b/packages/loot-core/src/server/budgetfiles/app.ts
@@ -8,13 +8,13 @@ import * as connection from '../../platform/server/connection';
import * as fs from '../../platform/server/fs';
import { logger } from '../../platform/server/log';
import * as Platform from '../../shared/platform';
-import { Budget } from '../../types/budget';
+import { type Budget } from '../../types/budget';
import { createApp } from '../app';
import * as budget from '../budget/base';
import * as cloudStorage from '../cloud-storage';
import * as db from '../db';
import * as mappings from '../db/mappings';
-import { handleBudgetImport, ImportableBudgetType } from '../importers';
+import { handleBudgetImport, type ImportableBudgetType } from '../importers';
import { app as mainApp } from '../main-app';
import { mutator } from '../mutators';
import * as prefs from '../prefs';
diff --git a/packages/loot-core/src/server/cloud-storage.ts b/packages/loot-core/src/server/cloud-storage.ts
index d550078149..1b838a0ec2 100644
--- a/packages/loot-core/src/server/cloud-storage.ts
+++ b/packages/loot-core/src/server/cloud-storage.ts
@@ -23,13 +23,13 @@ import { getServer } from './server-config';
const UPLOAD_FREQUENCY_IN_DAYS = 7;
-export interface UsersWithAccess {
+export type UsersWithAccess = {
userId: string;
userName: string;
displayName: string;
owner: boolean;
-}
-export interface RemoteFile {
+};
+export type RemoteFile = {
deleted: boolean;
fileId: string;
groupId: string;
@@ -38,7 +38,7 @@ export interface RemoteFile {
hasKey: boolean;
owner: string;
usersWithAccess: UsersWithAccess[];
-}
+};
async function checkHTTPStatus(res) {
if (res.status !== 200) {
diff --git a/packages/loot-core/src/server/db/index.ts b/packages/loot-core/src/server/db/index.ts
index 71d7f8c1d4..a9c599b319 100644
--- a/packages/loot-core/src/server/db/index.ts
+++ b/packages/loot-core/src/server/db/index.ts
@@ -7,7 +7,7 @@ import {
makeClientId,
Timestamp,
} from '@actual-app/crdt';
-import { Database } from '@jlongster/sql.js';
+import { type Database } from '@jlongster/sql.js';
import { LRUCache } from 'lru-cache';
import { v4 as uuidv4 } from 'uuid';
@@ -15,8 +15,8 @@ import * as fs from '../../platform/server/fs';
import * as sqlite from '../../platform/server/sqlite';
import * as monthUtils from '../../shared/months';
import { groupById } from '../../shared/util';
-import { TransactionEntity } from '../../types/models';
-import { WithRequired } from '../../types/util';
+import { type TransactionEntity } from '../../types/models';
+import { type WithRequired } from '../../types/util';
import {
schema,
schemaConfig,
@@ -35,18 +35,18 @@ import { sendMessages, batchMessages } from '../sync';
import { shoveSortOrders, SORT_INCREMENT } from './sort';
import {
- DbAccount,
- DbBank,
- DbCategory,
- DbCategoryGroup,
- DbCategoryMapping,
- DbClockMessage,
- DbPayee,
- DbPayeeMapping,
- DbTag,
- DbTransaction,
- DbViewTransaction,
- DbViewTransactionInternalAlive,
+ type DbAccount,
+ type DbBank,
+ type DbCategory,
+ type DbCategoryGroup,
+ type DbCategoryMapping,
+ type DbClockMessage,
+ type DbPayee,
+ type DbPayeeMapping,
+ type DbTag,
+ type DbTransaction,
+ type DbViewTransaction,
+ type DbViewTransactionInternalAlive,
} from './types';
export * from './types';
diff --git a/packages/loot-core/src/server/encryption/app.ts b/packages/loot-core/src/server/encryption/app.ts
index a6d85656ec..39c7db8749 100644
--- a/packages/loot-core/src/server/encryption/app.ts
+++ b/packages/loot-core/src/server/encryption/app.ts
@@ -2,7 +2,7 @@ import { v4 as uuidv4 } from 'uuid';
import * as asyncStorage from '../../platform/server/asyncStorage';
import { logger } from '../../platform/server/log';
-import { Budget } from '../../types/budget';
+import { type Budget } from '../../types/budget';
import { createApp } from '../app';
import { post } from '../post';
import * as prefs from '../prefs';
diff --git a/packages/loot-core/src/server/filters/app.ts b/packages/loot-core/src/server/filters/app.ts
index ecd32ce0f0..6e06f1422d 100644
--- a/packages/loot-core/src/server/filters/app.ts
+++ b/packages/loot-core/src/server/filters/app.ts
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import { v4 as uuidv4 } from 'uuid';
-import { TransactionFilterEntity } from '../../types/models';
+import { type TransactionFilterEntity } from '../../types/models';
import { createApp } from '../app';
import * as db from '../db';
import { requiredFields } from '../models';
diff --git a/packages/loot-core/src/server/importers/ynab4-types.ts b/packages/loot-core/src/server/importers/ynab4-types.ts
index f62d666041..15b45e9cca 100644
--- a/packages/loot-core/src/server/importers/ynab4-types.ts
+++ b/packages/loot-core/src/server/importers/ynab4-types.ts
@@ -1,4 +1,4 @@
-export interface YFull {
+export type YFull = {
masterCategories: MasterCategory[];
payees: Payee[];
monthlyBudgets: MonthlyBudget[];
@@ -8,9 +8,9 @@ export interface YFull {
// accountMappings: [];
budgetMetaData: BudgetMetaData;
accounts: Account[];
-}
+};
-export interface MasterCategory {
+export type MasterCategory = {
entityType: string;
expanded: boolean;
note?: string;
@@ -24,9 +24,9 @@ export interface MasterCategory {
// speculative
isTombstone?: boolean;
-}
+};
-export interface SubCategory {
+export type SubCategory = {
entityType: string;
name: string;
note?: string;
@@ -39,9 +39,9 @@ export interface SubCategory {
// speculative
isTombstone?: boolean;
-}
+};
-export interface Payee {
+export type Payee = {
entityType: string;
autoFillCategoryId?: string;
autoFillAmount: number;
@@ -56,26 +56,26 @@ export interface Payee {
// speculative
isTombstone?: boolean;
-}
+};
-export interface RenameCondition {
+export type RenameCondition = {
entityType: string;
parentPayeeId: string;
operator: string;
operand: string;
entityVersion: string;
entityId: string;
-}
+};
-export interface MonthlyBudget {
+export type MonthlyBudget = {
entityType: string;
monthlySubCategoryBudgets: MonthlySubCategoryBudget[];
month: string;
entityVersion: string;
entityId: string;
-}
+};
-export interface MonthlySubCategoryBudget {
+export type MonthlySubCategoryBudget = {
entityType: string;
categoryId: string;
budgeted: number;
@@ -86,15 +86,15 @@ export interface MonthlySubCategoryBudget {
// speculative
isTombstone?: boolean;
-}
+};
-export interface FileMetaData {
+export type FileMetaData = {
entityType: string;
budgetDataVersion: string;
currentKnowledge: string;
-}
+};
-export interface Transaction {
+export type Transaction = {
entityType: string;
entityId: string;
categoryId: string;
@@ -112,12 +112,12 @@ export interface Transaction {
subTransactions?: SubTransaction[];
transferTransactionId?: string;
targetAccountId?: string;
-}
+};
// speculative, not in the test data
export type SubTransaction = Omit<Transaction, 'subTransactions'>;
-export interface ScheduledTransaction {
+export type ScheduledTransaction = {
entityType: string;
entityId: string;
categoryId: string;
@@ -132,9 +132,9 @@ export interface ScheduledTransaction {
cleared: string;
frequency: string;
accepted: boolean;
-}
+};
-export interface BudgetMetaData {
+export type BudgetMetaData = {
entityType: string;
strictBudget: string;
currencyISOSymbol?: string;
@@ -143,9 +143,9 @@ export interface BudgetMetaData {
budgetType: string;
dateLocale: string;
entityId: string;
-}
+};
-export interface Account {
+export type Account = {
entityType: string;
// lastReconciledDate: null;
lastEnteredCheckNumber: number;
@@ -160,4 +160,4 @@ export interface Account {
// speculative
isTombstone?: boolean;
-}
+};
diff --git a/packages/loot-core/src/server/importers/ynab4.ts b/packages/loot-core/src/server/importers/ynab4.ts
index ec40bc6845..7f237b500e 100644
--- a/packages/loot-core/src/server/importers/ynab4.ts
+++ b/packages/loot-core/src/server/importers/ynab4.ts
@@ -13,7 +13,7 @@ import { logger } from '../../platform/server/log';
import * as monthUtils from '../../shared/months';
import { amountToInteger, groupBy, sortByKey } from '../../shared/util';
-import * as YNAB4 from './ynab4-types';
+import type * as YNAB4 from './ynab4-types';
// Importer
diff --git a/packages/loot-core/src/server/importers/ynab5-types.ts b/packages/loot-core/src/server/importers/ynab5-types.ts
index 7a1f75ee8c..86c124ee0c 100644
--- a/packages/loot-core/src/server/importers/ynab5-types.ts
+++ b/packages/loot-core/src/server/importers/ynab5-types.ts
@@ -1,4 +1,4 @@
-export interface Budget {
+export type Budget = {
name?: string;
budget_name?: string;
accounts: Account[];
@@ -8,41 +8,41 @@ export interface Budget {
transactions: Transaction[];
subtransactions: Subtransaction[];
months: Month[];
-}
+};
-export interface Account {
+export type Account = {
id: string;
name: string;
on_budget: boolean;
deleted: boolean;
closed: boolean;
-}
+};
-export interface Payee {
+export type Payee = {
id: string;
name: string;
deleted: boolean;
transfer_acct?: string;
-}
+};
-export interface CategoryGroup {
+export type CategoryGroup = {
id: string;
name: string;
deleted: boolean;
hidden: boolean;
note?: string;
-}
+};
-export interface Category {
+export type Category = {
id: string;
category_group_id: string;
name: string;
deleted: boolean;
hidden: boolean;
note?: string;
-}
+};
-export interface Transaction {
+export type Transaction = {
id: string;
account_id: string;
date: string;
@@ -55,9 +55,9 @@ export interface Transaction {
cleared: string;
amount: number;
deleted: boolean;
-}
+};
-export interface Subtransaction {
+export type Subtransaction = {
id: string;
transaction_id: string;
category_id: string;
@@ -65,15 +65,15 @@ export interface Subtransaction {
amount: number;
transfer_account_id: string;
payee_id: string;
-}
+};
-export interface Month {
+export type Month = {
month: string;
categories: MonthCategory[];
-}
+};
-export interface MonthCategory {
+export type MonthCategory = {
category_group_id: string;
id: string;
budgeted: number;
-}
+};
diff --git a/packages/loot-core/src/server/importers/ynab5.ts b/packages/loot-core/src/server/importers/ynab5.ts
index 435398e6cd..c121d44ca6 100644
--- a/packages/loot-core/src/server/importers/ynab5.ts
+++ b/packages/loot-core/src/server/importers/ynab5.ts
@@ -11,7 +11,7 @@ import { logger } from '../../platform/server/log';
import * as monthUtils from '../../shared/months';
import { sortByKey, groupBy } from '../../shared/util';
-import * as YNAB5 from './ynab5-types';
+import type * as YNAB5 from './ynab5-types';
function amountFromYnab(amount: number) {
// ynabs multiplies amount by 1000 and actual by 100
diff --git a/packages/loot-core/src/server/main-app.ts b/packages/loot-core/src/server/main-app.ts
index 2cde45a233..e5aec619d5 100644
--- a/packages/loot-core/src/server/main-app.ts
+++ b/packages/loot-core/src/server/main-app.ts
@@ -1,5 +1,5 @@
import * as connection from '../platform/server/connection';
-import { Handlers } from '../types/handlers';
+import { type Handlers } from '../types/handlers';
import { createApp } from './app';
diff --git a/packages/loot-core/src/server/main.ts b/packages/loot-core/src/server/main.ts
index e6ee4b7f25..cb25d16bbc 100644
--- a/packages/loot-core/src/server/main.ts
+++ b/packages/loot-core/src/server/main.ts
@@ -10,7 +10,7 @@ import { logger, setVerboseMode } from '../platform/server/log';
import * as sqlite from '../platform/server/sqlite';
import { q } from '../shared/query';
import { amountToInteger, integerToAmount } from '../shared/util';
-import { Handlers } from '../types/handlers';
+import { type Handlers } from '../types/handlers';
import { app as accountsApp } from './accounts/app';
import { app as adminApp } from './admin/app';
diff --git a/packages/loot-core/src/server/migrate/migrations.ts b/packages/loot-core/src/server/migrate/migrations.ts
index ff5a063b5c..3ffea3355d 100644
--- a/packages/loot-core/src/server/migrate/migrations.ts
+++ b/packages/loot-core/src/server/migrate/migrations.ts
@@ -2,7 +2,7 @@
// We have to bundle in JS migrations manually to avoid having to `eval`
// them which doesn't play well with CSP. There isn't great, and eventually
// we can remove this migration.
-import { Database } from '@jlongster/sql.js';
+import { type Database } from '@jlongster/sql.js';
import m1632571489012 from '../../../migrations/1632571489012_remove_cache';
import m1722717601000 from '../../../migrations/1722717601000_reports_move_selected_categories';
diff --git a/packages/loot-core/src/server/models.ts b/packages/loot-core/src/server/models.ts
index e93ef6bf5e..b7cf9e440c 100644
--- a/packages/loot-core/src/server/models.ts
+++ b/packages/loot-core/src/server/models.ts
@@ -1,7 +1,7 @@
import {
- CategoryEntity,
- CategoryGroupEntity,
- PayeeEntity,
+ type CategoryEntity,
+ type CategoryGroupEntity,
+ type PayeeEntity,
} from '../types/models';
import {
@@ -11,7 +11,12 @@ import {
schema,
schemaConfig,
} from './aql';
-import { DbAccount, DbCategory, DbCategoryGroup, DbPayee } from './db';
+import {
+ type DbAccount,
+ type DbCategory,
+ type DbCategoryGroup,
+ type DbPayee,
+} from './db';
import { ValidationError } from './errors';
export function requiredFields<T extends object, K extends keyof T>(
diff --git a/packages/loot-core/src/server/notes/app.ts b/packages/loot-core/src/server/notes/app.ts
index f59eb028ff..3842380004 100644
--- a/packages/loot-core/src/server/notes/app.ts
+++ b/packages/loot-core/src/server/notes/app.ts
@@ -1,4 +1,4 @@
-import { NoteEntity } from '../../types/models';
+import { type NoteEntity } from '../../types/models';
import { createApp } from '../app';
import * as db from '../db';
import { mutator } from '../mutators';
diff --git a/packages/loot-core/src/server/payees/app.ts b/packages/loot-core/src/server/payees/app.ts
index f0fa717598..e845bfaf1a 100644
--- a/packages/loot-core/src/server/payees/app.ts
+++ b/packages/loot-core/src/server/payees/app.ts
@@ -1,5 +1,5 @@
-import { Diff } from '../../shared/util';
-import { PayeeEntity, RuleEntity } from '../../types/models';
+import { type Diff } from '../../shared/util';
+import { type PayeeEntity, type RuleEntity } from '../../types/models';
import { createApp } from '../app';
import * as db from '../db';
import { payeeModel } from '../models';
diff --git a/packages/loot-core/src/server/preferences/app.ts b/packages/loot-core/src/server/preferences/app.ts
index 6030fe25b3..41c0b0c564 100644
--- a/packages/loot-core/src/server/preferences/app.ts
+++ b/packages/loot-core/src/server/preferences/app.ts
@@ -2,8 +2,8 @@ import * as asyncStorage from '../../platform/server/asyncStorage';
import * as fs from '../../platform/server/fs';
import { stringToInteger } from '../../shared/util';
import {
- GlobalPrefs,
- MetadataPrefs,
+ type GlobalPrefs,
+ type MetadataPrefs,
type SyncedPrefs,
} from '../../types/prefs';
import { createApp } from '../app';
@@ -18,14 +18,14 @@ import {
import { getServer } from '../server-config';
import { undoable } from '../undo';
-export interface PreferencesHandlers {
+export type PreferencesHandlers = {
'preferences/save': typeof saveSyncedPrefs;
'preferences/get': typeof getSyncedPrefs;
'save-global-prefs': typeof saveGlobalPrefs;
'load-global-prefs': typeof loadGlobalPrefs;
'save-prefs': typeof saveMetadataPrefs;
'load-prefs': typeof loadMetadataPrefs;
-}
+};
export const app = createApp<PreferencesHandlers>();
diff --git a/packages/loot-core/src/server/prefs.ts b/packages/loot-core/src/server/prefs.ts
index f5682c2506..8b96af27e0 100644
--- a/packages/loot-core/src/server/prefs.ts
+++ b/packages/loot-core/src/server/prefs.ts
@@ -4,7 +4,7 @@ import { Timestamp } from '@actual-app/crdt';
import * as fs from '../platform/server/fs';
import type { MetadataPrefs } from '../types/prefs';
-import { Message, sendMessages } from './sync';
+import { type Message, sendMessages } from './sync';
export const BUDGET_TYPES = ['tracking', 'envelope'] as const;
export type BudgetType = (typeof BUDGET_TYPES)[number];
diff --git a/packages/loot-core/src/server/rules/action.ts b/packages/loot-core/src/server/rules/action.ts
index a7b2acaa71..8425fb443a 100644
--- a/packages/loot-core/src/server/rules/action.ts
+++ b/packages/loot-core/src/server/rules/action.ts
@@ -8,7 +8,7 @@ import { amountToInteger } from 'loot-core/shared/util';
import { logger } from '../../platform/server/log';
import { parseDate, format, currentDay } from '../../shared/months';
import { FIELD_TYPES } from '../../shared/rules';
-import { TransactionForRules } from '../transactions/transaction-rules';
+import { type TransactionForRules } from '../transactions/transaction-rules';
import { CustomFunctionsPlugin } from './customFunctions';
import { assert } from './rule-utils';
diff --git a/packages/loot-core/src/server/rules/app.ts b/packages/loot-core/src/server/rules/app.ts
index a3fc38245b..9e2d6993bc 100644
--- a/packages/loot-core/src/server/rules/app.ts
+++ b/packages/loot-core/src/server/rules/app.ts
@@ -1,8 +1,8 @@
// @ts-strict-ignore
import { logger } from '../../platform/server/log';
import {
- RuleActionEntity,
- TransactionEntity,
+ type RuleActionEntity,
+ type TransactionEntity,
type RuleEntity,
} from '../../types/models';
import { createApp } from '../app';
diff --git a/packages/loot-core/src/server/rules/customFunctions.ts b/packages/loot-core/src/server/rules/customFunctions.ts
index 9c450dcfa3..90d576c474 100644
--- a/packages/loot-core/src/server/rules/customFunctions.ts
+++ b/packages/loot-core/src/server/rules/customFunctions.ts
@@ -1,6 +1,6 @@
import { FunctionPlugin, FunctionArgumentType } from 'hyperformula';
-import { InterpreterState } from 'hyperformula/typings/interpreter/InterpreterState';
-import { ProcedureAst } from 'hyperformula/typings/parser';
+import { type InterpreterState } from 'hyperformula/typings/interpreter/InterpreterState';
+import { type ProcedureAst } from 'hyperformula/typings/parser';
import { integerToAmount } from '../../shared/util';
diff --git a/packages/loot-core/src/server/rules/formula-action.test.ts b/packages/loot-core/src/server/rules/formula-action.test.ts
index fb776f02ce..c980c1289f 100644
--- a/packages/loot-core/src/server/rules/formula-action.test.ts
+++ b/packages/loot-core/src/server/rules/formula-action.test.ts
@@ -1,6 +1,6 @@
import { describe, it, expect } from 'vitest';
-import { TransactionForRules } from '../transactions/transaction-rules';
+import { type TransactionForRules } from '../transactions/transaction-rules';
import { Action } from './action';
diff --git a/packages/loot-core/src/server/rules/rule-indexer.ts b/packages/loot-core/src/server/rules/rule-indexer.ts
index 485593acd2..f495497eeb 100644
--- a/packages/loot-core/src/server/rules/rule-indexer.ts
+++ b/packages/loot-core/src/server/rules/rule-indexer.ts
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import { fastSetMerge } from '../../shared/util';
-import { Rule } from './rule';
+import { type Rule } from './rule';
export class RuleIndexer {
field: string;
diff --git a/packages/loot-core/src/server/rules/rule-utils.ts b/packages/loot-core/src/server/rules/rule-utils.ts
index ccd2ea896a..6b667266b8 100644
--- a/packages/loot-core/src/server/rules/rule-utils.ts
+++ b/packages/loot-core/src/server/rules/rule-utils.ts
@@ -3,11 +3,11 @@ import * as dateFns from 'date-fns';
import { logger } from '../../platform/server/log';
import { recurConfigToRSchedule } from '../../shared/schedules';
-import { RuleConditionEntity } from '../../types/models';
+import { type RuleConditionEntity } from '../../types/models';
import { RuleError } from '../errors';
import { RSchedule } from '../util/rschedule';
-import { Rule } from './rule';
+import { type Rule } from './rule';
export function assert(test: unknown, type: string, msg: string): asserts test {
if (!test) {
diff --git a/packages/loot-core/src/server/rules/rule.ts b/packages/loot-core/src/server/rules/rule.ts
index 701443a8e9..4cf047d910 100644
--- a/packages/loot-core/src/server/rules/rule.ts
+++ b/packages/loot-core/src/server/rules/rule.ts
@@ -6,7 +6,7 @@ import {
splitTransaction,
ungroupTransaction,
} from '../../shared/transactions';
-import { RuleEntity } from '../../types/models';
+import { type RuleEntity } from '../../types/models';
import { Action } from './action';
import { Condition } from './condition';
diff --git a/packages/loot-core/src/server/schedules/app.ts b/packages/loot-core/src/server/schedules/app.ts
index 99b6fbc4d9..7235bd49b1 100644
--- a/packages/loot-core/src/server/schedules/app.ts
+++ b/packages/loot-core/src/server/schedules/app.ts
@@ -17,7 +17,7 @@ import {
getStatus,
recurConfigToRSchedule,
} from '../../shared/schedules';
-import { ScheduleEntity } from '../../types/models';
+import { type ScheduleEntity } from '../../types/models';
import { addTransactions } from '../accounts/sync';
import { createApp } from '../app';
import { aqlQuery } from '../aql';
diff --git a/packages/loot-core/src/server/sheet.ts b/packages/loot-core/src/server/sheet.ts
index a065bd15e6..7384e36137 100644
--- a/packages/loot-core/src/server/sheet.ts
+++ b/packages/loot-core/src/server/sheet.ts
@@ -7,11 +7,12 @@ import * as sqlite from '../platform/server/sqlite';
import { sheetForMonth } from '../shared/months';
import * as Platform from '../shared/platform';
+import type * as DbModule from './db';
import {
- DbPreference,
- DbReflectBudget,
- DbZeroBudget,
- DbZeroBudgetMonth,
+ type DbPreference,
+ type DbReflectBudget,
+ type DbZeroBudget,
+ type DbZeroBudgetMonth,
} from './db';
import { Spreadsheet } from './spreadsheet/spreadsheet';
import { resolveName } from './spreadsheet/util';
@@ -196,9 +197,7 @@ export async function reloadSpreadsheet(db): Promise<Spreadsheet> {
}
}
-export async function loadUserBudgets(
- db: typeof import('./db'),
-): Promise<void> {
+export async function loadUserBudgets(db: typeof DbModule): Promise<void> {
const sheet = globalSheet;
// TODO: Clear out the cache here so make sure future loads of the app
diff --git a/packages/loot-core/src/server/spreadsheet/app.ts b/packages/loot-core/src/server/spreadsheet/app.ts
index 05443e8c76..ba2237c690 100644
--- a/packages/loot-core/src/server/spreadsheet/app.ts
+++ b/packages/loot-core/src/server/spreadsheet/app.ts
@@ -1,4 +1,4 @@
-import { QueryState } from '../../shared/query';
+import { type QueryState } from '../../shared/query';
import { createApp } from '../app';
import * as sheet from '../sheet';
diff --git a/packages/loot-core/src/server/spreadsheet/graph-data-structure.ts b/packages/loot-core/src/server/spreadsheet/graph-data-structure.ts
index f5bc30a92f..e0052aba3e 100644
--- a/packages/loot-core/src/server/spreadsheet/graph-data-structure.ts
+++ b/packages/loot-core/src/server/spreadsheet/graph-data-structure.ts
@@ -157,9 +157,9 @@ export function Graph() {
return graph;
}
-interface StackItem {
+type StackItem = {
count: number;
value: string;
parent: string;
level: number;
-}
+};
diff --git a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
index 124a123b21..9920d22885 100644
--- a/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
+++ b/packages/loot-core/src/server/spreadsheet/spreadsheet.ts
@@ -2,9 +2,9 @@
import mitt from 'mitt';
import { logger } from '../../platform/server/log';
-import { QueryState } from '../../shared/query';
+import { type QueryState } from '../../shared/query';
import { compileQuery, aqlCompiledQuery, schema, schemaConfig } from '../aql';
-import { BudgetType } from '../prefs';
+import { type BudgetType } from '../prefs';
import { Graph } from './graph-data-structure';
import { unresolveName, resolveName } from './util';
diff --git a/packages/loot-core/src/server/sync/encoder.ts b/packages/loot-core/src/server/sync/encoder.ts
index 771b592c34..2f3ca0549d 100644
--- a/packages/loot-core/src/server/sync/encoder.ts
+++ b/packages/loot-core/src/server/sync/encoder.ts
@@ -6,7 +6,7 @@ import * as encryption from '../encryption';
import { SyncError } from '../errors';
import * as prefs from '../prefs';
-import { Message } from './index';
+import { type Message } from './index';
function coerceBuffer(value) {
// The web encryption APIs give us back raw Uint8Array... but our
diff --git a/packages/loot-core/src/server/sync/migrate.test.ts b/packages/loot-core/src/server/sync/migrate.test.ts
index 06efe29f86..7f2355786e 100644
--- a/packages/loot-core/src/server/sync/migrate.test.ts
+++ b/packages/loot-core/src/server/sync/migrate.test.ts
@@ -9,7 +9,7 @@ import * as db from '../db';
import { listen, unlisten } from './migrate';
-import { Message, addSyncListener, sendMessages } from './index';
+import { type Message, addSyncListener, sendMessages } from './index';
beforeEach(() => {
listen();
diff --git a/packages/loot-core/src/server/sync/migrate.ts b/packages/loot-core/src/server/sync/migrate.ts
index 804967e30a..f622ba5eff 100644
--- a/packages/loot-core/src/server/sync/migrate.ts
+++ b/packages/loot-core/src/server/sync/migrate.ts
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import { Timestamp } from '@actual-app/crdt';
-import { Message, addSyncListener, applyMessages } from './index';
+import { type Message, addSyncListener, applyMessages } from './index';
function migrateParentIds(_oldValues, newValues) {
newValues.forEach((items, table) => {
diff --git a/packages/loot-core/src/server/tags/app.ts b/packages/loot-core/src/server/tags/app.ts
index 92be65c701..38e677171b 100644
--- a/packages/loot-core/src/server/tags/app.ts
+++ b/packages/loot-core/src/server/tags/app.ts
@@ -1,4 +1,4 @@
-import { TagEntity } from '../../types/models';
+import { type TagEntity } from '../../types/models';
import { createApp } from '../app';
import * as db from '../db';
import { mutator } from '../mutators';
diff --git a/packages/loot-core/src/server/tests/mockSyncServer.ts b/packages/loot-core/src/server/tests/mockSyncServer.ts
index 08d3eb4018..e66c053146 100644
--- a/packages/loot-core/src/server/tests/mockSyncServer.ts
+++ b/packages/loot-core/src/server/tests/mockSyncServer.ts
@@ -1,13 +1,13 @@
// @ts-strict-ignore
import {
- Clock,
+ type Clock,
makeClock,
Timestamp,
merkle,
SyncProtoBuf,
} from '@actual-app/crdt';
-import { Message } from '../sync';
+import { type Message } from '../sync';
import { basic as defaultMockData } from './mockData.json';
diff --git a/packages/loot-core/src/server/tools/app.ts b/packages/loot-core/src/server/tools/app.ts
index 6b096ee7cf..ea4a16b39b 100644
--- a/packages/loot-core/src/server/tools/app.ts
+++ b/packages/loot-core/src/server/tools/app.ts
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import { q } from '../../shared/query';
-import { TransactionEntity } from '../../types/models';
+import { type TransactionEntity } from '../../types/models';
import { createApp } from '../app';
import { aqlQuery } from '../aql';
import * as db from '../db';
diff --git a/packages/loot-core/src/server/transactions/app.ts b/packages/loot-core/src/server/transactions/app.ts
index afc9f2607a..8c2981e0f3 100644
--- a/packages/loot-core/src/server/transactions/app.ts
+++ b/packages/loot-core/src/server/transactions/app.ts
@@ -1,9 +1,9 @@
-import { q, Query, QueryState } from '../../shared/query';
+import { q, Query, type QueryState } from '../../shared/query';
import {
- AccountEntity,
- CategoryGroupEntity,
- PayeeEntity,
- TransactionEntity,
+ type AccountEntity,
+ type CategoryGroupEntity,
+ type PayeeEntity,
+ type TransactionEntity,
} from '../../types/models';
import { createApp } from '../app';
import { aqlQuery } from '../aql';
@@ -11,7 +11,7 @@ import { mutator } from '../mutators';
import { undoable } from '../undo';
import { exportQueryToCSV, exportToCSV } from './export/export-to-csv';
-import { parseFile, ParseFileOptions } from './import/parse-file';
+import { parseFile, type ParseFileOptions } from './import/parse-file';
import { mergeTransactions } from './merge';
import { batchUpdateTransactions } from '.';
diff --git a/packages/loot-core/src/server/transactions/import/xmlcamt2json.ts b/packages/loot-core/src/server/transactions/import/xmlcamt2json.ts
index d488ed3e1a..6433a1fb1d 100644
--- a/packages/loot-core/src/server/transactions/import/xmlcamt2json.ts
+++ b/packages/loot-core/src/server/transactions/import/xmlcamt2json.ts
@@ -4,7 +4,7 @@ import { parseStringPromise } from 'xml2js';
type DateRef = { DtTm: string } | { Dt: string };
type Amt = { _: string };
-interface Ntry {
+type Ntry = {
AcctSvcrRef?: string;
Amt?: Amt;
CdtDbtInd: 'CRDT' | 'DBIT';
@@ -13,13 +13,13 @@ interface Ntry {
NtryDtls?: NtryDtls;
AddtlNtryInf?: string;
NtryRef?: string;
-}
+};
-interface NtryDtls {
+type NtryDtls = {
TxDtls: TxDtls | TxDtls[];
-}
+};
-interface TxDtls {
+type TxDtls = {
RltdPties?: {
Cdtr: {
Nm: string;
@@ -31,16 +31,16 @@ interface TxDtls {
RmtInf?: {
Ustrd: string | string[];
};
-}
+};
-interface TransactionCAMT {
+type TransactionCAMT = {
amount: number;
date: string;
payee_name: string | null;
imported_payee: string | null;
notes: string | null;
imported_id?: string;
-}
+};
function findKeys(obj: object, key: string): unknown[] {
let result = [];
diff --git a/packages/loot-core/src/server/transactions/index.ts b/packages/loot-core/src/server/transactions/index.ts
index d99ad0bc14..916337f288 100644
--- a/packages/loot-core/src/server/transactions/index.ts
+++ b/packages/loot-core/src/server/transactions/index.ts
@@ -1,8 +1,8 @@
// @ts-strict-ignore
import * as connection from '../../platform/server/connection';
-import { Diff } from '../../shared/util';
-import { PayeeEntity, TransactionEntity } from '../../types/models';
+import { type Diff } from '../../shared/util';
+import { type PayeeEntity, type TransactionEntity } from '../../types/models';
import * as db from '../db';
import { incrFetch, whereIn } from '../db/util';
import { batchMessages } from '../sync';
diff --git a/packages/loot-core/src/server/transactions/merge.test.ts b/packages/loot-core/src/server/transactions/merge.test.ts
index 0110718ff9..a6c4f34f13 100644
--- a/packages/loot-core/src/server/transactions/merge.test.ts
+++ b/packages/loot-core/src/server/transactions/merge.test.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { TransactionEntity } from '../../types/models';
+import { type TransactionEntity } from '../../types/models';
import * as db from '../db';
import { mergeTransactions } from './merge';
diff --git a/packages/loot-core/src/server/undo.ts b/packages/loot-core/src/server/undo.ts
index 8882d347d1..a31ee699c3 100644
--- a/packages/loot-core/src/server/undo.ts
+++ b/packages/loot-core/src/server/undo.ts
@@ -6,7 +6,7 @@ import { getIn } from '../shared/util';
import { type HandlerFunctions } from '../types/handlers';
import { withMutatorContext, getMutatorContext } from './mutators';
-import { Message, sendMessages } from './sync';
+import { type Message, sendMessages } from './sync';
// A marker always sits as the first entry to simplify logic
type MarkerMessage = { type: 'marker'; meta?: unknown };
diff --git a/packages/loot-core/src/shared/currencies.ts b/packages/loot-core/src/shared/currencies.ts
index 8253bd029f..c4854db517 100644
--- a/packages/loot-core/src/shared/currencies.ts
+++ b/packages/loot-core/src/shared/currencies.ts
@@ -1,4 +1,4 @@
-import { NumberFormats } from './util';
+import { type NumberFormats } from './util';
export type Currency = {
code: string;
diff --git a/packages/loot-core/src/shared/months.ts b/packages/loot-core/src/shared/months.ts
index d3e6bda25a..b2b8a4266e 100644
--- a/packages/loot-core/src/shared/months.ts
+++ b/packages/loot-core/src/shared/months.ts
@@ -1,6 +1,6 @@
// @ts-strict-ignore
import * as d from 'date-fns';
-import { Locale } from 'date-fns';
+import { type Locale } from 'date-fns';
import memoizeOne from 'memoize-one';
import { type SyncedPrefs } from '../types/prefs';
diff --git a/packages/loot-core/src/shared/query.ts b/packages/loot-core/src/shared/query.ts
index b53ad14986..336130d91e 100644
--- a/packages/loot-core/src/shared/query.ts
+++ b/packages/loot-core/src/shared/query.ts
@@ -1,4 +1,4 @@
-import { WithRequired } from '../types/util';
+import { type WithRequired } from '../types/util';
type ObjectExpression = {
[key: string]: ObjectExpression | unknown;
diff --git a/packages/loot-core/src/shared/rules.ts b/packages/loot-core/src/shared/rules.ts
index 3313c7629a..ea1c0db63c 100644
--- a/packages/loot-core/src/shared/rules.ts
+++ b/packages/loot-core/src/shared/rules.ts
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import { t } from 'i18next';
-import { FieldValueTypes, RuleConditionOp } from '../types/models';
+import { type FieldValueTypes, type RuleConditionOp } from '../types/models';
// For now, this info is duplicated from the backend. Figure out how
// to share it later.
diff --git a/packages/loot-core/src/shared/schedules.ts b/packages/loot-core/src/shared/schedules.ts
index 69c81a2151..005939d5a9 100644
--- a/packages/loot-core/src/shared/schedules.ts
+++ b/packages/loot-core/src/shared/schedules.ts
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import type { IRuleOptions } from '@rschedule/core';
import * as d from 'date-fns';
-import { Locale } from 'date-fns';
+import { type Locale } from 'date-fns';
import { t } from 'i18next';
import {
diff --git a/packages/loot-core/src/shared/transactions.test.ts b/packages/loot-core/src/shared/transactions.test.ts
index e083bcb126..cdd3d69e7d 100644
--- a/packages/loot-core/src/shared/transactions.test.ts
+++ b/packages/loot-core/src/shared/transactions.test.ts
@@ -1,7 +1,7 @@
// @ts-strict-ignore
import { v4 as uuidv4 } from 'uuid';
-import { TransactionEntity } from '../types/models';
+import { type TransactionEntity } from '../types/models';
import {
splitTransaction,
diff --git a/packages/loot-core/src/types/api-handlers.ts b/packages/loot-core/src/types/api-handlers.ts
index ccc43254a3..9ac3d1681d 100644
--- a/packages/loot-core/src/types/api-handlers.ts
+++ b/packages/loot-core/src/types/api-handlers.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import { ImportTransactionsOpts } from '@actual-app/api';
+import { type ImportTransactionsOpts } from '@actual-app/api';
import type { ImportTransactionsResult } from '../server/accounts/app';
import type {
@@ -10,7 +10,7 @@ import type {
APIPayeeEntity,
APIScheduleEntity,
} from '../server/api-models';
-import { BudgetFileHandlers } from '../server/budgetfiles/app';
+import { type BudgetFileHandlers } from '../server/budgetfiles/app';
import { type batchUpdateTransactions } from '../server/transactions';
import type { QueryState } from '../shared/query';
@@ -22,7 +22,7 @@ import type {
ScheduleEntity,
} from './models';
-export interface ApiHandlers {
+export type ApiHandlers = {
'api/batch-budget-start': () => Promise<void>;
'api/batch-budget-end': () => Promise<void>;
@@ -249,4 +249,4 @@ export interface ApiHandlers {
'api/get-server-version': () => Promise<
{ error: 'no-server' } | { error: 'network-failure' } | { version: string }
>;
-}
+};
diff --git a/packages/loot-core/src/types/file.ts b/packages/loot-core/src/types/file.ts
index 27bf6c051b..b45e5c01ac 100644
--- a/packages/loot-core/src/types/file.ts
+++ b/packages/loot-core/src/types/file.ts
@@ -1,6 +1,6 @@
-import { UsersWithAccess } from '../server/cloud-storage';
+import { type UsersWithAccess } from '../server/cloud-storage';
-import { Budget } from './budget';
+import { type Budget } from './budget';
export type FileState =
| 'local'
diff --git a/packages/loot-core/src/types/handlers.ts b/packages/loot-core/src/types/handlers.ts
index 575247fceb..37bd9d623f 100644
--- a/packages/loot-core/src/types/handlers.ts
+++ b/packages/loot-core/src/types/handlers.ts
@@ -21,28 +21,26 @@ import type { TransactionHandlers } from '../server/transactions/app';
import type { ApiHandlers } from './api-handlers';
import type { ServerHandlers } from './server-handlers';
-export interface Handlers
- extends
- ServerHandlers,
- ApiHandlers,
- BudgetHandlers,
- DashboardHandlers,
- FiltersHandlers,
- NotesHandlers,
- PreferencesHandlers,
- ReportsHandlers,
- RulesHandlers,
- SchedulesHandlers,
- TransactionHandlers,
- AdminHandlers,
- ToolsHandlers,
- AccountHandlers,
- PayeesHandlers,
- SpreadsheetHandlers,
- SyncHandlers,
- BudgetFileHandlers,
- EncryptionHandlers,
- TagsHandlers,
- AuthHandlers {}
+export type Handlers = {} & ServerHandlers &
+ ApiHandlers &
+ BudgetHandlers &
+ DashboardHandlers &
+ FiltersHandlers &
+ NotesHandlers &
+ PreferencesHandlers &
+ ReportsHandlers &
+ RulesHandlers &
+ SchedulesHandlers &
+ TransactionHandlers &
+ AdminHandlers &
+ ToolsHandlers &
+ AccountHandlers &
+ PayeesHandlers &
+ SpreadsheetHandlers &
+ SyncHandlers &
+ BudgetFileHandlers &
+ EncryptionHandlers &
+ TagsHandlers &
+ AuthHandlers;
export type HandlerFunctions = Handlers[keyof Handlers];
diff --git a/packages/loot-core/src/types/models/bank-sync.ts b/packages/loot-core/src/types/models/bank-sync.ts
index 789c9c578c..6f39d39b78 100644
--- a/packages/loot-core/src/types/models/bank-sync.ts
+++ b/packages/loot-core/src/types/models/bank-sync.ts
@@ -1,7 +1,7 @@
import {
- GoCardlessAmount,
- GoCardlessBalance,
- GoCardlessTransaction,
+ type GoCardlessAmount,
+ type GoCardlessBalance,
+ type GoCardlessTransaction,
} from './gocardless';
export type BankSyncBalance = GoCardlessBalance;
diff --git a/packages/loot-core/src/types/models/category-group.ts b/packages/loot-core/src/types/models/category-group.ts
index d128cf3070..965da1ff5b 100644
--- a/packages/loot-core/src/types/models/category-group.ts
+++ b/packages/loot-core/src/types/models/category-group.ts
@@ -1,6 +1,6 @@
-import { CategoryEntity } from './category';
+import { type CategoryEntity } from './category';
-export interface CategoryGroupEntity {
+export type CategoryGroupEntity = {
id: string;
name: string;
is_income?: boolean;
@@ -8,4 +8,4 @@ export interface CategoryGroupEntity {
tombstone?: boolean;
hidden?: boolean;
categories?: CategoryEntity[];
-}
+};
diff --git a/packages/loot-core/src/types/models/category.ts b/packages/loot-core/src/types/models/category.ts
index 5193181401..ef6b93acc7 100644
--- a/packages/loot-core/src/types/models/category.ts
+++ b/packages/loot-core/src/types/models/category.ts
@@ -1,6 +1,6 @@
-import { CategoryGroupEntity } from './category-group';
+import { type CategoryGroupEntity } from './category-group';
-export interface CategoryEntity {
+export type CategoryEntity = {
id: string;
name: string;
is_income?: boolean;
@@ -10,4 +10,4 @@ export interface CategoryEntity {
sort_order?: number;
tombstone?: boolean;
hidden?: boolean;
-}
+};
diff --git a/packages/loot-core/src/types/models/import-transaction.ts b/packages/loot-core/src/types/models/import-transaction.ts
index ea586a6787..aac4fc3416 100644
--- a/packages/loot-core/src/types/models/import-transaction.ts
+++ b/packages/loot-core/src/types/models/import-transaction.ts
@@ -2,7 +2,7 @@
* Represents a transaction object specifically for import operations.
* This type is used when importing transactions from external sources.
*/
-export interface ImportTransactionEntity {
+export type ImportTransactionEntity = {
/** Required. The ID of the account this transaction belongs to */
account: string;
@@ -53,4 +53,4 @@ export interface ImportTransactionEntity {
category?: string;
notes?: string;
}>;
-}
+};
diff --git a/packages/loot-core/src/types/models/payee.ts b/packages/loot-core/src/types/models/payee.ts
index a559c4b93f..388506b3bf 100644
--- a/packages/loot-core/src/types/models/payee.ts
+++ b/packages/loot-core/src/types/models/payee.ts
@@ -1,10 +1,10 @@
-import { AccountEntity } from './account';
+import { type AccountEntity } from './account';
-export interface PayeeEntity {
+export type PayeeEntity = {
id: string;
name: string;
transfer_acct?: AccountEntity['id'];
favorite?: boolean;
learn_categories?: boolean;
tombstone?: boolean;
-}
+};
diff --git a/packages/loot-core/src/types/models/reports.ts b/packages/loot-core/src/types/models/reports.ts
index 0b5b1346de..4d90957962 100644
--- a/packages/loot-core/src/types/models/reports.ts
+++ b/packages/loot-core/src/types/models/reports.ts
@@ -1,6 +1,6 @@
import { type RuleConditionEntity } from './rule';
-export interface CustomReportEntity {
+export type CustomReportEntity = {
id: string;
name: string;
startDate: string;
@@ -23,7 +23,7 @@ export interface CustomReportEntity {
conditionsOp: 'and' | 'or';
data?: GroupedEntity;
tombstone?: boolean;
-}
+};
export type balanceTypeOpType =
| 'totalAssets'
@@ -44,15 +44,15 @@ export type SpendingMonthEntity = Record<
}
>;
-export interface SpendingDataEntity {
+export type SpendingDataEntity = {
date: string;
totalAssets: number;
totalDebts: number;
totalTotals: number;
cumulative: number;
-}
+};
-export interface SpendingEntity {
+export type SpendingEntity = {
intervalData: {
months: SpendingMonthEntity;
day: string;
@@ -66,9 +66,9 @@ export interface SpendingEntity {
totalDebts: number;
totalAssets: number;
totalTotals: number;
-}
+};
-export interface DataEntity {
+export type DataEntity = {
data?: GroupedEntity[];
intervalData: IntervalEntity[];
groupedData?: GroupedEntity[] | null;
@@ -80,7 +80,7 @@ export interface DataEntity {
netAssets: number;
netDebts: number;
totalTotals: number;
-}
+};
export type LegendEntity = {
name: string;
@@ -100,7 +100,7 @@ export type IntervalEntity = {
totalTotals: number;
};
-export interface GroupedEntity {
+export type GroupedEntity = {
id: string;
name: string;
date?: string;
@@ -111,13 +111,13 @@ export interface GroupedEntity {
netAssets: number;
netDebts: number;
categories?: GroupedEntity[];
-}
+};
export type Interval = {
interval: string;
};
-export interface CustomReportData {
+export type CustomReportData = {
id: string;
name: string;
start_date: string;
@@ -140,4 +140,4 @@ export interface CustomReportData {
metadata?: GroupedEntity;
interval: string;
color_scheme?: string;
-}
+};
diff --git a/packages/loot-core/src/types/models/rule.ts b/packages/loot-core/src/types/models/rule.ts
index 4735280da3..91546b8bc1 100644
--- a/packages/loot-core/src/types/models/rule.ts
+++ b/packages/loot-core/src/types/models/rule.ts
@@ -1,16 +1,16 @@
import { type RecurConfig, type ScheduleEntity } from './schedule';
-export interface NewRuleEntity {
+export type NewRuleEntity = {
stage: 'pre' | null | 'post';
conditionsOp: 'or' | 'and';
conditions: RuleConditionEntity[];
actions: RuleActionEntity[];
tombstone?: boolean;
-}
+};
-export interface RuleEntity extends NewRuleEntity {
+export type RuleEntity = {
id: string;
-}
+} & NewRuleEntity;
export type RuleConditionOp = RuleConditionEntity['op'];
@@ -128,7 +128,7 @@ export type RuleActionEntity =
| AppendNoteRuleActionEntity
| DeleteTransactionRuleActionEntity;
-export interface SetRuleActionEntity {
+export type SetRuleActionEntity = {
field: string;
op: 'set';
value: unknown;
@@ -138,33 +138,33 @@ export interface SetRuleActionEntity {
splitIndex?: number;
};
type?: string;
-}
+};
-export interface SetSplitAmountRuleActionEntity {
+export type SetSplitAmountRuleActionEntity = {
op: 'set-split-amount';
value: number;
options?: {
splitIndex?: number;
method: 'fixed-amount' | 'fixed-percent' | 'remainder';
};
-}
+};
-export interface LinkScheduleRuleActionEntity {
+export type LinkScheduleRuleActionEntity = {
op: 'link-schedule';
value: ScheduleEntity;
-}
+};
-export interface PrependNoteRuleActionEntity {
+export type PrependNoteRuleActionEntity = {
op: 'prepend-notes';
value: string;
-}
+};
-export interface AppendNoteRuleActionEntity {
+export type AppendNoteRuleActionEntity = {
op: 'append-notes';
value: string;
-}
+};
-export interface DeleteTransactionRuleActionEntity {
+export type DeleteTransactionRuleActionEntity = {
op: 'delete-transaction';
value: string;
-}
+};
diff --git a/packages/loot-core/src/types/models/schedule.ts b/packages/loot-core/src/types/models/schedule.ts
index 1c5682d17e..a5c49a8886 100644
--- a/packages/loot-core/src/types/models/schedule.ts
+++ b/packages/loot-core/src/types/models/schedule.ts
@@ -2,12 +2,12 @@ import type { AccountEntity } from './account';
import type { PayeeEntity } from './payee';
import type { RuleConditionEntity, RuleEntity } from './rule';
-export interface RecurPattern {
+export type RecurPattern = {
value: number;
type: 'SU' | 'MO' | 'TU' | 'WE' | 'TH' | 'FR' | 'SA' | 'day';
-}
+};
-export interface RecurConfig {
+export type RecurConfig = {
frequency: 'daily' | 'weekly' | 'monthly' | 'yearly';
interval?: number;
patterns?: RecurPattern[];
@@ -17,9 +17,9 @@ export interface RecurConfig {
endOccurrences?: number;
endDate?: string;
weekendSolveMode?: 'before' | 'after';
-}
+};
-export interface ScheduleEntity {
+export type ScheduleEntity = {
id: string;
name?: string;
rule: RuleEntity['id'];
@@ -37,7 +37,7 @@ export interface ScheduleEntity {
_date: RecurConfig | string;
_conditions: RuleConditionEntity[];
_actions: Array<{ op: unknown }>;
-}
+};
export type DiscoverScheduleEntity = {
id: ScheduleEntity['id'];
diff --git a/packages/loot-core/src/types/models/simplefin.ts b/packages/loot-core/src/types/models/simplefin.ts
index 5ce7b47fb4..70b67bb004 100644
--- a/packages/loot-core/src/types/models/simplefin.ts
+++ b/packages/loot-core/src/types/models/simplefin.ts
@@ -1,5 +1,5 @@
-import { AccountEntity } from './account';
-import { BankSyncResponse } from './bank-sync';
+import { type AccountEntity } from './account';
+import { type BankSyncResponse } from './bank-sync';
export type SimpleFinOrganization = {
id: string;
@@ -14,9 +14,9 @@ export type SimpleFinAccount = {
org: SimpleFinOrganization;
};
-export interface SimpleFinBatchSyncResponse {
+export type SimpleFinBatchSyncResponse = {
[accountId: NonNullable<AccountEntity['account_id']>]: BankSyncResponse;
-}
+};
export type SyncServerSimpleFinAccount = {
balance: number;
diff --git a/packages/loot-core/src/types/models/tags.ts b/packages/loot-core/src/types/models/tags.ts
index 1f1f369e06..34c27e9575 100644
--- a/packages/loot-core/src/types/models/tags.ts
+++ b/packages/loot-core/src/types/models/tags.ts
@@ -1,6 +1,6 @@
-export interface TagEntity {
+export type TagEntity = {
id: string;
tag: string;
color?: string | null;
description?: string | null;
-}
+};
diff --git a/packages/loot-core/src/types/models/templates.ts b/packages/loot-core/src/types/models/templates.ts
index 666fec4470..b8e4b09672 100644
--- a/packages/loot-core/src/types/models/templates.ts
+++ b/packages/loot-core/src/types/models/templates.ts
@@ -1,20 +1,20 @@
-interface BaseTemplate {
+type BaseTemplate = {
type: string;
directive: 'template' | 'goal' | 'error';
-}
-interface BaseTemplateWithPriority extends BaseTemplate {
+};
+type BaseTemplateWithPriority = {
priority: number;
directive: 'template';
-}
+} & BaseTemplate;
-export interface PercentageTemplate extends BaseTemplateWithPriority {
+export type PercentageTemplate = {
type: 'percentage';
percent: number;
previous: boolean;
category: string;
-}
+} & BaseTemplateWithPriority;
-export interface PeriodicTemplate extends BaseTemplateWithPriority {
+export type PeriodicTemplate = {
type: 'periodic';
amount: number;
period: {
@@ -28,27 +28,27 @@ export interface PeriodicTemplate extends BaseTemplateWithPriority {
period: 'daily' | 'weekly' | 'monthly';
start?: string;
};
-}
+} & BaseTemplateWithPriority;
-export interface ByTemplate extends BaseTemplateWithPriority {
+export type ByTemplate = {
type: 'by';
amount: number;
month: string;
annual?: boolean;
repeat?: number;
from?: string;
-}
+} & BaseTemplateWithPriority;
-export interface SpendTemplate extends BaseTemplateWithPriority {
+export type SpendTemplate = {
type: 'spend';
amount: number;
month: string;
from: string;
annual?: boolean;
repeat?: number;
-}
+} & BaseTemplateWithPriority;
-export interface SimpleTemplate extends BaseTemplateWithPriority {
+export type SimpleTemplate = {
type: 'simple';
monthly?: number;
limit?: {
@@ -57,26 +57,26 @@ export interface SimpleTemplate extends BaseTemplateWithPriority {
period: 'daily' | 'weekly' | 'monthly';
start?: string;
};
-}
+} & BaseTemplateWithPriority;
-export interface ScheduleTemplate extends BaseTemplateWithPriority {
+export type ScheduleTemplate = {
type: 'schedule';
name: string;
full?: boolean;
adjustment?: number;
-}
+} & BaseTemplateWithPriority;
-export interface AverageTemplate extends BaseTemplateWithPriority {
+export type AverageTemplate = {
type: 'average';
numMonths: number;
-}
+} & BaseTemplateWithPriority;
-export interface CopyTemplate extends BaseTemplateWithPriority {
+export type CopyTemplate = {
type: 'copy';
lookBack: number;
-}
+} & BaseTemplateWithPriority;
-export interface RemainderTemplate extends BaseTemplate {
+export type RemainderTemplate = {
type: 'remainder';
weight: number;
limit?: {
@@ -87,15 +87,15 @@ export interface RemainderTemplate extends BaseTemplate {
};
directive: 'template';
priority: null;
-}
+} & BaseTemplate;
-export interface GoalTemplate extends BaseTemplate {
+export type GoalTemplate = {
type: 'goal';
amount: number;
directive: 'goal';
-}
+} & BaseTemplate;
-export interface LimitTemplate extends BaseTemplate {
+export type LimitTemplate = {
type: 'limit';
amount: number;
hold: boolean;
@@ -103,14 +103,14 @@ export interface LimitTemplate extends BaseTemplate {
start?: string;
directive: 'template';
priority: null;
-}
+} & BaseTemplate;
-interface ErrorTemplate extends BaseTemplate {
+type ErrorTemplate = {
type: 'error';
line: string;
error: string;
directive: 'error';
-}
+} & BaseTemplate;
export type Template =
| PercentageTemplate
diff --git a/packages/loot-core/src/types/models/transaction-filter.ts b/packages/loot-core/src/types/models/transaction-filter.ts
index c688cc6fb4..c8b4cb1427 100644
--- a/packages/loot-core/src/types/models/transaction-filter.ts
+++ b/packages/loot-core/src/types/models/transaction-filter.ts
@@ -1,9 +1,9 @@
import { type RuleConditionEntity } from './rule';
-export interface TransactionFilterEntity {
+export type TransactionFilterEntity = {
id: string;
name: string;
conditionsOp: 'and' | 'or';
conditions: RuleConditionEntity[];
tombstone: boolean;
-}
+};
diff --git a/packages/loot-core/src/types/models/transaction.ts b/packages/loot-core/src/types/models/transaction.ts
index 0b5d9e6fcf..afde8d792e 100644
--- a/packages/loot-core/src/types/models/transaction.ts
+++ b/packages/loot-core/src/types/models/transaction.ts
@@ -1,11 +1,11 @@
-import { IntegerAmount } from '../../shared/util';
+import { type IntegerAmount } from '../../shared/util';
-import { AccountEntity } from './account';
-import { CategoryEntity } from './category';
-import { PayeeEntity } from './payee';
-import { ScheduleEntity } from './schedule';
+import { type AccountEntity } from './account';
+import { type CategoryEntity } from './category';
+import { type PayeeEntity } from './payee';
+import { type ScheduleEntity } from './schedule';
-export interface TransactionEntity {
+export type TransactionEntity = {
id: string;
is_parent?: boolean;
is_child?: boolean;
@@ -36,4 +36,4 @@ export interface TransactionEntity {
} | null;
raw_synced_data?: string | undefined;
_ruleErrors?: string[];
-}
+};
diff --git a/packages/loot-core/src/types/models/user-access.ts b/packages/loot-core/src/types/models/user-access.ts
index a1fdb2508e..99f6e21b99 100644
--- a/packages/loot-core/src/types/models/user-access.ts
+++ b/packages/loot-core/src/types/models/user-access.ts
@@ -1,10 +1,10 @@
-export interface NewUserAccessEntity {
+export type NewUserAccessEntity = {
fileId: string;
userId: string;
-}
+};
-export interface UserAccessEntity extends NewUserAccessEntity {
+export type UserAccessEntity = {
displayName: string;
userName: string;
fileName: string;
-}
+} & NewUserAccessEntity;
diff --git a/packages/loot-core/src/types/models/user.ts b/packages/loot-core/src/types/models/user.ts
index 666e089bb4..6fc980481b 100644
--- a/packages/loot-core/src/types/models/user.ts
+++ b/packages/loot-core/src/types/models/user.ts
@@ -1,25 +1,25 @@
-export interface NewUserEntity {
+export type NewUserEntity = {
userName: string;
displayName: string;
role: string;
enabled: boolean;
-}
+};
-export interface UserEntity extends NewUserEntity {
+export type UserEntity = {
id: string;
owner: boolean;
-}
+} & NewUserEntity;
-export interface UserEntityDropdown {
+export type UserEntityDropdown = {
userId: string;
userName: string;
displayName?: string;
-}
+};
-export interface UserAvailable {
+export type UserAvailable = {
userId: string;
displayName?: string;
userName: string;
haveAccess?: number;
owner?: number;
-}
+};
diff --git a/packages/loot-core/src/types/server-events.ts b/packages/loot-core/src/types/server-events.ts
index e3f77a6f20..9f36ae94ca 100644
--- a/packages/loot-core/src/types/server-events.ts
+++ b/packages/loot-core/src/types/server-events.ts
@@ -67,7 +67,7 @@ type StartImportEvent = { budgetName: string };
type StartLoadEvent = undefined;
type ApiFetchRedirectedEvent = undefined;
-export interface ServerEvents {
+export type ServerEvents = {
'backups-updated': BackupUpdatedEvent;
'cells-changed': CellsChangedEvent;
'fallback-write-error': FallbackWriteErrorEvent;
@@ -83,4 +83,4 @@ export interface ServerEvents {
'sync-event': SyncEvent;
'undo-event': UndoState;
'api-fetch-redirected': ApiFetchRedirectedEvent;
-}
+};
diff --git a/packages/loot-core/src/types/server-handlers.ts b/packages/loot-core/src/types/server-handlers.ts
index 9251995b01..0550f04822 100644
--- a/packages/loot-core/src/types/server-handlers.ts
+++ b/packages/loot-core/src/types/server-handlers.ts
@@ -1,6 +1,6 @@
-import { QueryState } from '../shared/query';
+import { type QueryState } from '../shared/query';
-export interface ServerHandlers {
+export type ServerHandlers = {
undo: () => Promise<void>;
redo: () => Promise<void>;
@@ -24,4 +24,4 @@ export interface ServerHandlers {
}) => Promise<{ error?: string }>;
'app-focused': () => Promise<void>;
-}
+};
diff --git a/packages/loot-core/typings/window.ts b/packages/loot-core/typings/window.ts
index 8980ee3c4c..1d8d3e1409 100644
--- a/packages/loot-core/typings/window.ts
+++ b/packages/loot-core/typings/window.ts
@@ -1,4 +1,6 @@
// @ts-strict-ignore
+import { type NavigateFunction } from 'react-router';
+
export {};
type FileDialogOptions = {
@@ -45,8 +47,9 @@ type Actual = {
};
declare global {
+ // oxlint-disable-next-line typescript/consistent-type-definitions
interface Window {
- __navigate?: import('react-router').NavigateFunction;
+ __navigate?: NavigateFunction;
}
var Actual: Actual;
diff --git a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts b/packages/sync-server/src/app-gocardless/banks/bank.interface.ts
index 5049bd9831..5fd799b006 100644
--- a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts
+++ b/packages/sync-server/src/app-gocardless/banks/bank.interface.ts
@@ -1,7 +1,7 @@
-import { Transaction, Balance } from '../gocardless-node.types';
+import { type Transaction, type Balance } from '../gocardless-node.types';
import {
- DetailedAccountWithInstitution,
- NormalizedAccountDetails,
+ type DetailedAccountWithInstitution,
+ type NormalizedAccountDetails,
} from '../gocardless.types';
type TransactionExtended = Transaction & {
@@ -12,7 +12,7 @@ type TransactionExtended = Transaction & {
remittanceInformationStructuredArrayString?: string;
};
-export interface IBank {
+export type IBank = {
institutionIds: string[];
/**
@@ -48,4 +48,4 @@ export interface IBank {
sortedTransactions: Transaction[],
balances: Balance[],
) => number;
-}
+};
diff --git a/packages/sync-server/src/app-gocardless/gocardless.types.ts b/packages/sync-server/src/app-gocardless/gocardless.types.ts
index d9c032a518..7314fef7b2 100644
--- a/packages/sync-server/src/app-gocardless/gocardless.types.ts
+++ b/packages/sync-server/src/app-gocardless/gocardless.types.ts
@@ -1,10 +1,10 @@
import {
- GoCardlessAccountMetadata,
- GoCardlessAccountDetails,
- Institution,
- Transactions,
- Balance,
- Transaction,
+ type GoCardlessAccountMetadata,
+ type GoCardlessAccountDetails,
+ type Institution,
+ type Transactions,
+ type Balance,
+ type Transaction,
} from './gocardless-node.types';
export type DetailedAccount = Omit<GoCardlessAccountDetails, 'status'> &
diff --git a/packages/sync-server/src/config-types.ts b/packages/sync-server/src/config-types.ts
index 2365fefaad..04972a3e52 100644
--- a/packages/sync-server/src/config-types.ts
+++ b/packages/sync-server/src/config-types.ts
@@ -1,8 +1,8 @@
-import { ServerOptions } from 'https';
+import { type ServerOptions } from 'https';
type LoginMethod = 'password' | 'header' | 'openid';
-export interface Config {
+export type Config = {
mode: 'test' | 'development';
loginMethod?: LoginMethod;
allowedLoginMethods: LoginMethod[];
@@ -41,4 +41,4 @@ export interface Config {
token_expiration?: 'never' | 'openid-provider' | number;
enforceOpenId: boolean;
userCreationMode?: 'manual' | 'login';
-}
+};
diff --git a/upcoming-release-notes/6450.md b/upcoming-release-notes/6450.md
new file mode 100644
index 0000000000..867479a8a8
--- /dev/null
+++ b/upcoming-release-notes/6450.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+lint: patch typescript lint issues