Skip to content

A local-first personal finance app

Move more .d.ts files to .ts (#5060)

Julian Dominguez-Schatz5a40b017f018
diff --git a/packages/api/tsconfig.dist.json b/packages/api/tsconfig.dist.json
index 34f89f078d..adc9dcd0b7 100644
--- a/packages/api/tsconfig.dist.json
+++ b/packages/api/tsconfig.dist.json
@@ -11,7 +11,7 @@
"outDir": "dist",
"declarationDir": "@types",
"paths": {
- "loot-core/*": ["./@types/loot-core/*"]
+ "loot-core/*": ["./@types/loot-core/src/*"]
}
},
"include": ["."],
diff --git a/packages/desktop-client/src/browser-preload.browser.js b/packages/desktop-client/src/browser-preload.browser.js
index 74e46e8c72..31e828fdf6 100644
--- a/packages/desktop-client/src/browser-preload.browser.js
+++ b/packages/desktop-client/src/browser-preload.browser.js
@@ -22,7 +22,7 @@ const ACTUAL_VERSION = Platform.isPlaywright
: packageJson.version;
// *** Start the backend ***
-let worker;
+let worker = null;
function createBackendWorker() {
worker = new Worker(backendWorkerUrl);
diff --git a/packages/desktop-client/src/components/App.tsx b/packages/desktop-client/src/components/App.tsx
index 8a6cca5a81..412620ff6e 100644
--- a/packages/desktop-client/src/components/App.tsx
+++ b/packages/desktop-client/src/components/App.tsx
@@ -71,7 +71,7 @@ function AppInner() {
};
async function init() {
- const socketName = await maybeUpdate(() =>
+ const serverSocket = await maybeUpdate(() =>
global.Actual.getServerSocket(),
);
@@ -82,7 +82,7 @@ function AppInner() {
),
}),
);
- await initConnection(socketName);
+ await initConnection(serverSocket);
// Load any global prefs
dispatch(
diff --git a/packages/desktop-client/src/components/budget/goals/BudgetAutomation.tsx b/packages/desktop-client/src/components/budget/goals/BudgetAutomation.tsx
index 41da07ef7c..9f25891438 100644
--- a/packages/desktop-client/src/components/budget/goals/BudgetAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/BudgetAutomation.tsx
@@ -3,11 +3,11 @@ import { useCallback, useMemo, useReducer, useState } from 'react';
import { Stack } from '@actual-app/components/stack';
import { type CSSProperties } from '@actual-app/components/styles';
-import { type Template } from 'loot-core/server/budget/types/templates';
import {
type CategoryGroupEntity,
type ScheduleEntity,
} from 'loot-core/types/models';
+import { type Template } from 'loot-core/types/models/templates';
import { type Action } from './actions';
import { BudgetAutomationEditor } from './BudgetAutomationEditor';
diff --git a/packages/desktop-client/src/components/budget/goals/CategoryAutomationButton.tsx b/packages/desktop-client/src/components/budget/goals/CategoryAutomationButton.tsx
index 9916412aee..68db28de5d 100644
--- a/packages/desktop-client/src/components/budget/goals/CategoryAutomationButton.tsx
+++ b/packages/desktop-client/src/components/budget/goals/CategoryAutomationButton.tsx
@@ -4,7 +4,7 @@ import { Button } from '@actual-app/components/button';
import { SvgChartPie } from '@actual-app/components/icons/v1';
import { theme } from '@actual-app/components/theme';
-import { type Template } from 'loot-core/server/budget/types/templates';
+import { type Template } from 'loot-core/types/models/templates';
import { useFeatureFlag } from '@desktop-client/hooks/useFeatureFlag';
import { pushModal } from '@desktop-client/modals/modalsSlice';
diff --git a/packages/desktop-client/src/components/budget/goals/actions.ts b/packages/desktop-client/src/components/budget/goals/actions.ts
index 5e9f7890c5..f11b2a5a01 100644
--- a/packages/desktop-client/src/components/budget/goals/actions.ts
+++ b/packages/desktop-client/src/components/budget/goals/actions.ts
@@ -1,4 +1,4 @@
-import { type Template } from 'loot-core/server/budget/types/templates';
+import { type Template } from 'loot-core/types/models/templates';
import { type DisplayTemplateType } from './constants';
diff --git a/packages/desktop-client/src/components/budget/goals/constants.ts b/packages/desktop-client/src/components/budget/goals/constants.ts
index 8497e2104c..b26e032ab5 100644
--- a/packages/desktop-client/src/components/budget/goals/constants.ts
+++ b/packages/desktop-client/src/components/budget/goals/constants.ts
@@ -5,7 +5,7 @@ import {
type ScheduleTemplate,
type SimpleTemplate,
type WeekTemplate,
-} from 'loot-core/server/budget/types/templates';
+} from 'loot-core/types/models/templates';
export const displayTemplateTypes = [
['simple', 'Fixed (monthly)'] as const,
diff --git a/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomation.tsx
index d2e9279acb..19986ea4da 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomation.tsx
@@ -6,7 +6,7 @@ import { Stack } from '@actual-app/components/stack';
import type {
CopyTemplate,
AverageTemplate,
-} from 'loot-core/server/budget/types/templates';
+} from 'loot-core/types/models/templates';
import {
type Action,
diff --git a/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomationReadOnly.tsx b/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomationReadOnly.tsx
index 625bfbaecc..c45d12e6ba 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomationReadOnly.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/HistoricalAutomationReadOnly.tsx
@@ -3,7 +3,7 @@ import { Trans } from 'react-i18next';
import type {
CopyTemplate,
AverageTemplate,
-} from 'loot-core/server/budget/types/templates';
+} from 'loot-core/types/models/templates';
type HistoricalAutomationReadOnlyProps = {
template: CopyTemplate | AverageTemplate;
diff --git a/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomation.tsx
index de2a797a26..5f03bd3f0b 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomation.tsx
@@ -4,11 +4,11 @@ import { Select } from '@actual-app/components/select';
import { Stack } from '@actual-app/components/stack';
import { View } from '@actual-app/components/view';
-import type { PercentageTemplate } from 'loot-core/server/budget/types/templates';
import type {
CategoryGroupEntity,
CategoryEntity,
} from 'loot-core/types/models';
+import type { PercentageTemplate } from 'loot-core/types/models/templates';
import { CategoryAutocomplete } from '@desktop-client/components/autocomplete/CategoryAutocomplete';
import {
diff --git a/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomationReadOnly.tsx b/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomationReadOnly.tsx
index 78964cb433..d71ef6ad56 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomationReadOnly.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/PercentageAutomationReadOnly.tsx
@@ -1,6 +1,6 @@
import { useTranslation, Trans } from 'react-i18next';
-import type { PercentageTemplate } from 'loot-core/server/budget/types/templates';
+import type { PercentageTemplate } from 'loot-core/types/models/templates';
type PercentageAutomationReadOnlyProps = {
template: PercentageTemplate;
diff --git a/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomation.tsx
index f8dd87e662..fd4336df2e 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomation.tsx
@@ -4,8 +4,8 @@ import { Select } from '@actual-app/components/select';
import { Stack } from '@actual-app/components/stack';
import { Text } from '@actual-app/components/text';
-import type { ScheduleTemplate } from 'loot-core/server/budget/types/templates';
import type { ScheduleEntity } from 'loot-core/types/models';
+import type { ScheduleTemplate } from 'loot-core/types/models/templates';
import {
type Action,
diff --git a/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomationReadOnly.tsx b/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomationReadOnly.tsx
index e7e9d0459e..857e48db8d 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomationReadOnly.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/ScheduleAutomationReadOnly.tsx
@@ -1,6 +1,6 @@
import { Trans } from 'react-i18next';
-import type { ScheduleTemplate } from 'loot-core/server/budget/types/templates';
+import type { ScheduleTemplate } from 'loot-core/types/models/templates';
type ScheduleAutomationReadOnlyProps = {
template: ScheduleTemplate;
diff --git a/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomation.tsx
index 6bab67bb46..0e0db88383 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomation.tsx
@@ -1,6 +1,6 @@
import { useTranslation } from 'react-i18next';
-import type { SimpleTemplate } from 'loot-core/server/budget/types/templates';
+import type { SimpleTemplate } from 'loot-core/types/models/templates';
import {
type Action,
diff --git a/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomationReadOnly.tsx b/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomationReadOnly.tsx
index 0e073ef4df..045739b877 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomationReadOnly.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/SimpleAutomationReadOnly.tsx
@@ -1,7 +1,7 @@
import { Trans } from 'react-i18next';
-import type { SimpleTemplate } from 'loot-core/server/budget/types/templates';
import { integerToCurrency } from 'loot-core/shared/util';
+import type { SimpleTemplate } from 'loot-core/types/models/templates';
type SimpleAutomationReadOnlyProps = {
template: SimpleTemplate;
diff --git a/packages/desktop-client/src/components/budget/goals/editor/WeekAutomation.tsx b/packages/desktop-client/src/components/budget/goals/editor/WeekAutomation.tsx
index d1668a3bf0..64297f0a43 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/WeekAutomation.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/WeekAutomation.tsx
@@ -1,6 +1,6 @@
import { useTranslation } from 'react-i18next';
-import type { WeekTemplate } from 'loot-core/server/budget/types/templates';
+import type { WeekTemplate } from 'loot-core/types/models/templates';
import {
type Action,
diff --git a/packages/desktop-client/src/components/budget/goals/editor/WeekAutomationReadOnly.tsx b/packages/desktop-client/src/components/budget/goals/editor/WeekAutomationReadOnly.tsx
index 9f95ec8d4a..2d3c8cbf85 100644
--- a/packages/desktop-client/src/components/budget/goals/editor/WeekAutomationReadOnly.tsx
+++ b/packages/desktop-client/src/components/budget/goals/editor/WeekAutomationReadOnly.tsx
@@ -1,7 +1,7 @@
import { Trans } from 'react-i18next';
-import type { WeekTemplate } from 'loot-core/server/budget/types/templates';
import { integerToCurrency } from 'loot-core/shared/util';
+import type { WeekTemplate } from 'loot-core/types/models/templates';
type WeekAutomationReadOnlyProps = {
template: WeekTemplate;
diff --git a/packages/desktop-client/src/components/budget/goals/reducer.ts b/packages/desktop-client/src/components/budget/goals/reducer.ts
index f2bb1be44b..308601d6ae 100644
--- a/packages/desktop-client/src/components/budget/goals/reducer.ts
+++ b/packages/desktop-client/src/components/budget/goals/reducer.ts
@@ -1,4 +1,4 @@
-import { type Template } from 'loot-core/server/budget/types/templates';
+import { type Template } from 'loot-core/types/models/templates';
import { type Action } from './actions';
import { type ReducerState, type DisplayTemplateType } from './constants';
diff --git a/packages/desktop-client/src/components/modals/BudgetAutomationsModal.tsx b/packages/desktop-client/src/components/modals/BudgetAutomationsModal.tsx
index 0b4a4f84d5..a8f1b20166 100644
--- a/packages/desktop-client/src/components/modals/BudgetAutomationsModal.tsx
+++ b/packages/desktop-client/src/components/modals/BudgetAutomationsModal.tsx
@@ -6,8 +6,8 @@ import { Stack } from '@actual-app/components/stack';
import { theme } from '@actual-app/components/theme';
import { uniqueId } from 'lodash';
-import { type Template } from 'loot-core/server/budget/types/templates';
import { q } from 'loot-core/shared/query';
+import { type Template } from 'loot-core/types/models/templates';
import { BudgetAutomation } from '@desktop-client/components/budget/goals/BudgetAutomation';
import { useBudgetAutomationCategories } from '@desktop-client/components/budget/goals/useBudgetAutomationCategories';
diff --git a/packages/desktop-electron/index.ts b/packages/desktop-electron/index.ts
index 805dabc06f..bf80202bd1 100644
--- a/packages/desktop-electron/index.ts
+++ b/packages/desktop-electron/index.ts
@@ -596,7 +596,7 @@ ipcMain.handle('relaunch', () => {
});
export type OpenFileDialogPayload = {
- properties: OpenDialogSyncOptions['properties'];
+ properties?: OpenDialogSyncOptions['properties'];
filters?: OpenDialogSyncOptions['filters'];
};
diff --git a/packages/loot-core/src/platform/client/fetch/__mocks__/index.ts b/packages/loot-core/src/platform/client/fetch/__mocks__/index.ts
index 5507651386..87bcefab07 100644
--- a/packages/loot-core/src/platform/client/fetch/__mocks__/index.ts
+++ b/packages/loot-core/src/platform/client/fetch/__mocks__/index.ts
@@ -1,5 +1,5 @@
// @ts-strict-ignore
-import type * as T from '../index.d';
+import type * as T from '../index-types';
let listeners = new Map();
let serverHandler = null;
diff --git a/packages/loot-core/src/platform/client/fetch/index.d.ts b/packages/loot-core/src/platform/client/fetch/index-types.ts
similarity index 67%
rename from packages/loot-core/src/platform/client/fetch/index.d.ts
rename to packages/loot-core/src/platform/client/fetch/index-types.ts
index 67ce138505..b17f4bb318 100644
--- a/packages/loot-core/src/platform/client/fetch/index.d.ts
+++ b/packages/loot-core/src/platform/client/fetch/index-types.ts
@@ -1,10 +1,10 @@
import type { Handlers } from '../../../types/handlers';
import type { ServerEvents } from '../../../types/server-events';
-export function init(socketName: string): Promise<unknown>;
+export declare function init(worker: Worker): Promise<unknown>;
export type Init = typeof init;
-export function send<K extends keyof Handlers>(
+export declare function send<K extends keyof Handlers>(
name: K,
args: Parameters<Handlers[K]>[0],
options: { catchErrors: true },
@@ -15,14 +15,14 @@ export function send<K extends keyof Handlers>(
error: { type: 'APIError' | 'InternalError'; message: string };
}
>;
-export function send<K extends keyof Handlers>(
+export declare function send<K extends keyof Handlers>(
name: K,
args?: Parameters<Handlers[K]>[0],
options?: { catchErrors?: boolean },
): Promise<Awaited<ReturnType<Handlers[K]>>>;
export type Send = typeof send;
-export function sendCatch<K extends keyof Handlers>(
+export declare function sendCatch<K extends keyof Handlers>(
name: K,
args?: Parameters<Handlers[K]>[0],
): Promise<
@@ -34,21 +34,21 @@ export function sendCatch<K extends keyof Handlers>(
>;
export type SendCatch = typeof sendCatch;
-export function listen<K extends keyof ServerEvents>(
+export declare function listen<K extends keyof ServerEvents>(
name: K,
cb: (arg: ServerEvents[K]) => void,
): () => void;
export type Listen = typeof listen;
-export function unlisten(name: string): void;
+export declare function unlisten(name: string): void;
export type Unlisten = typeof unlisten;
/** Mock functions */
-export function initServer(handlers: Partial<Handlers>): void;
+export declare function initServer(handlers: Partial<Handlers>): void;
export type InitServer = typeof initServer;
-export function serverPush(name: string, args: unknown): void;
+export declare function serverPush(name: string, args: unknown): void;
export type ServerPush = typeof serverPush;
-export async function clearServer(): void;
+export declare function clearServer(): Promise<void>;
export type ClearServer = typeof clearServer;
diff --git a/packages/loot-core/src/platform/client/fetch/index.browser.ts b/packages/loot-core/src/platform/client/fetch/index.browser.ts
index fac6e3c7f8..14243fd017 100644
--- a/packages/loot-core/src/platform/client/fetch/index.browser.ts
+++ b/packages/loot-core/src/platform/client/fetch/index.browser.ts
@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from 'uuid';
import { captureException, captureBreadcrumb } from '../../exceptions';
import * as undo from '../undo';
-import type * as T from './index.d';
+import type * as T from './index-types';
const replyHandlers = new Map();
const listeners = new Map();
diff --git a/packages/loot-core/src/platform/client/fetch/index.ts b/packages/loot-core/src/platform/client/fetch/index.ts
index 5a0d8a0d08..1a2bd5b59a 100644
--- a/packages/loot-core/src/platform/client/fetch/index.ts
+++ b/packages/loot-core/src/platform/client/fetch/index.ts
@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid';
import * as undo from '../undo';
-import type * as T from './index.d';
+import type * as T from './index-types';
const replyHandlers = new Map();
const listeners = new Map();
diff --git a/packages/loot-core/src/server/accounts/app.ts b/packages/loot-core/src/server/accounts/app.ts
index 482bb3d304..69d611e003 100644
--- a/packages/loot-core/src/server/accounts/app.ts
+++ b/packages/loot-core/src/server/accounts/app.ts
@@ -16,6 +16,7 @@ import {
SyncServerSimpleFinAccount,
SyncServerPluggyAiAccount,
type GoCardlessToken,
+ ImportTransactionEntity,
} from '../../types/models';
import { createApp } from '../app';
import * as db from '../db';
@@ -1087,7 +1088,7 @@ async function importTransactions({
opts,
}: {
accountId: AccountEntity['id'];
- transactions: TransactionEntity[];
+ transactions: ImportTransactionEntity[];
isPreview: boolean;
opts?: {
defaultCleared: boolean;
diff --git a/packages/loot-core/src/server/budget/category-template-context.test.ts b/packages/loot-core/src/server/budget/category-template-context.test.ts
index f0c79ef3ee..db71da8582 100644
--- a/packages/loot-core/src/server/budget/category-template-context.test.ts
+++ b/packages/loot-core/src/server/budget/category-template-context.test.ts
@@ -2,11 +2,11 @@ import { vi } from 'vitest';
import { amountToInteger } from '../../shared/util';
import { type CategoryEntity } from '../../types/models';
+import { type Template } from '../../types/models/templates';
import * as db from '../db';
import * as actions from './actions';
import { CategoryTemplateContext } from './category-template-context';
-import { type Template } from './types/templates';
// Mock getSheetValue and getCategories
vi.mock('./actions', () => ({
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 48791fd15c..913ceec1cf 100644
--- a/packages/loot-core/src/server/budget/category-template-context.ts
+++ b/packages/loot-core/src/server/budget/category-template-context.ts
@@ -3,11 +3,6 @@
import * as monthUtils from '../../shared/months';
import { amountToInteger } from '../../shared/util';
import { CategoryEntity } from '../../types/models';
-import * as db from '../db';
-
-import { getSheetValue, getSheetBoolean } from './actions';
-import { runSchedule } from './schedule-template';
-import { getActiveSchedules } from './statements';
import {
AverageTemplate,
ByTemplate,
@@ -19,7 +14,12 @@ import {
SpendTemplate,
Template,
WeekTemplate,
-} from './types/templates';
+} from '../../types/models/templates';
+import * as db from '../db';
+
+import { getSheetValue, getSheetBoolean } from './actions';
+import { runSchedule } from './schedule-template';
+import { getActiveSchedules } from './statements';
export class CategoryTemplateContext {
/*----------------------------------------------------------------------------
diff --git a/packages/loot-core/src/server/budget/goal-template.ts b/packages/loot-core/src/server/budget/goal-template.ts
index b73aec5fad..b3cc4a1c0f 100644
--- a/packages/loot-core/src/server/budget/goal-template.ts
+++ b/packages/loot-core/src/server/budget/goal-template.ts
@@ -2,13 +2,13 @@
import * as monthUtils from '../../shared/months';
import { q } from '../../shared/query';
import { CategoryEntity, CategoryGroupEntity } from '../../types/models';
+import { Template } from '../../types/models/templates';
import { aqlQuery } from '../aql';
import { batchMessages } from '../sync';
import { isReflectBudget, getSheetValue, setGoal, setBudget } from './actions';
import { CategoryTemplateContext } from './category-template-context';
import { checkTemplates, storeTemplates } from './template-notes';
-import { Template } from './types/templates';
type Notification = {
type?: 'message' | 'error' | 'warning' | undefined;
diff --git a/packages/loot-core/src/server/budget/schedule-template.ts b/packages/loot-core/src/server/budget/schedule-template.ts
index f1881aa64a..e57a468545 100644
--- a/packages/loot-core/src/server/budget/schedule-template.ts
+++ b/packages/loot-core/src/server/budget/schedule-template.ts
@@ -6,11 +6,11 @@ import {
extractScheduleConds,
} from '../../shared/schedules';
import { CategoryEntity } from '../../types/models';
+import { ScheduleTemplate, Template } from '../../types/models/templates';
import * as db from '../db';
import { getRuleForSchedule } from '../schedules/app';
import { isReflectBudget } from './actions';
-import { ScheduleTemplate, Template } from './types/templates';
type ScheduleTemplateTarget = {
name: string;
diff --git a/packages/loot-core/src/server/budget/template-notes.ts b/packages/loot-core/src/server/budget/template-notes.ts
index faac45bf76..90a99c6613 100644
--- a/packages/loot-core/src/server/budget/template-notes.ts
+++ b/packages/loot-core/src/server/budget/template-notes.ts
@@ -1,3 +1,4 @@
+import { Template } from '../../types/models/templates';
import * as db from '../db';
import { parse } from './goal-template.pegjs';
@@ -7,7 +8,6 @@ import {
getCategoriesWithTemplateNotes,
resetCategoryGoalDefsWithNoTemplates,
} from './statements';
-import { Template } from './types/templates';
type Notification = {
type?: 'message' | 'error' | 'warning' | undefined;
diff --git a/packages/loot-core/src/types/api-handlers.ts b/packages/loot-core/src/types/api-handlers.ts
index 83e5c1be2e..5b3bba34c5 100644
--- a/packages/loot-core/src/types/api-handlers.ts
+++ b/packages/loot-core/src/types/api-handlers.ts
@@ -12,7 +12,12 @@ import type {
import { BudgetFileHandlers } from '../server/budgetfiles/app';
import { type batchUpdateTransactions } from '../server/transactions';
-import type { NewRuleEntity, RuleEntity, TransactionEntity } from './models';
+import type {
+ ImportTransactionEntity,
+ NewRuleEntity,
+ RuleEntity,
+ TransactionEntity,
+} from './models';
export interface ApiHandlers {
'api/batch-budget-start': () => Promise<unknown>;
@@ -83,7 +88,7 @@ export interface ApiHandlers {
'api/transactions-import': (arg: {
accountId;
- transactions;
+ transactions: ImportTransactionEntity[];
isPreview?;
opts?: ImportTransactionsOpts;
}) => Promise<ImportTransactionsResult>;
diff --git a/packages/loot-core/src/types/models/account.d.ts b/packages/loot-core/src/types/models/account.ts
similarity index 96%
rename from packages/loot-core/src/types/models/account.d.ts
rename to packages/loot-core/src/types/models/account.ts
index 86b934f5b4..b10817fc72 100644
--- a/packages/loot-core/src/types/models/account.d.ts
+++ b/packages/loot-core/src/types/models/account.ts
@@ -8,7 +8,7 @@ export type AccountEntity = {
tombstone: 0 | 1;
} & (_SyncFields<true> | _SyncFields<false>);
-type _SyncFields<T> = {
+export type _SyncFields<T> = {
account_id: T extends true ? string : null;
bank: T extends true ? string : null;
bankName: T extends true ? string : null;
diff --git a/packages/loot-core/src/types/models/bank.d.ts b/packages/loot-core/src/types/models/bank.ts
similarity index 100%
rename from packages/loot-core/src/types/models/bank.d.ts
rename to packages/loot-core/src/types/models/bank.ts
diff --git a/packages/loot-core/src/types/models/import-transaction.d.ts b/packages/loot-core/src/types/models/import-transaction.ts
similarity index 100%
rename from packages/loot-core/src/types/models/import-transaction.d.ts
rename to packages/loot-core/src/types/models/import-transaction.ts
diff --git a/packages/loot-core/src/types/models/index.ts b/packages/loot-core/src/types/models/index.ts
index 876b209597..96e4bd3636 100644
--- a/packages/loot-core/src/types/models/index.ts
+++ b/packages/loot-core/src/types/models/index.ts
@@ -5,6 +5,7 @@ export type * from './category';
export type * from './category-group';
export type * from './dashboard';
export type * from './gocardless';
+export type * from './import-transaction';
export type * from './note';
export type * from './openid';
export type * from './payee';
diff --git a/packages/loot-core/src/types/models/pluggyai.d.ts b/packages/loot-core/src/types/models/pluggyai.ts
similarity index 100%
rename from packages/loot-core/src/types/models/pluggyai.d.ts
rename to packages/loot-core/src/types/models/pluggyai.ts
diff --git a/packages/loot-core/src/server/budget/types/templates.d.ts b/packages/loot-core/src/types/models/templates.ts
similarity index 72%
rename from packages/loot-core/src/server/budget/types/templates.d.ts
rename to packages/loot-core/src/types/models/templates.ts
index 8cfeddfbc3..647eed86c2 100644
--- a/packages/loot-core/src/server/budget/types/templates.d.ts
+++ b/packages/loot-core/src/types/models/templates.ts
@@ -4,14 +4,14 @@ interface BaseTemplate {
directive: string;
}
-interface PercentageTemplate extends BaseTemplate {
+export interface PercentageTemplate extends BaseTemplate {
type: 'percentage';
percent: number;
previous: boolean;
category: string;
}
-interface WeekTemplate extends BaseTemplate {
+export interface WeekTemplate extends BaseTemplate {
type: 'week';
amount: number;
weeks: number | null;
@@ -24,7 +24,7 @@ interface WeekTemplate extends BaseTemplate {
};
}
-interface ByTemplate extends BaseTemplate {
+export interface ByTemplate extends BaseTemplate {
type: 'by';
amount: number;
month: string;
@@ -33,7 +33,7 @@ interface ByTemplate extends BaseTemplate {
from?: string;
}
-interface SpendTemplate extends BaseTemplate {
+export interface SpendTemplate extends BaseTemplate {
type: 'spend';
amount: number;
month: string;
@@ -42,7 +42,7 @@ interface SpendTemplate extends BaseTemplate {
repeat?: number;
}
-interface SimpleTemplate extends BaseTemplate {
+export interface SimpleTemplate extends BaseTemplate {
type: 'simple';
monthly?: number;
limit?: {
@@ -53,14 +53,14 @@ interface SimpleTemplate extends BaseTemplate {
};
}
-interface ScheduleTemplate extends BaseTemplate {
+export interface ScheduleTemplate extends BaseTemplate {
type: 'schedule';
name: string;
full?: boolean;
adjustment?: number;
}
-interface RemainderTemplate extends BaseTemplate {
+export interface RemainderTemplate extends BaseTemplate {
type: 'remainder';
weight: number;
limit?: {
@@ -71,17 +71,17 @@ interface RemainderTemplate extends BaseTemplate {
};
}
-interface AverageTemplate extends BaseTemplate {
+export interface AverageTemplate extends BaseTemplate {
type: 'average';
numMonths: number;
}
-interface GoalTemplate extends BaseTemplate {
+export interface GoalTemplate extends BaseTemplate {
type: 'goal';
amount: number;
}
-interface CopyTemplate extends BaseTemplate {
+export interface CopyTemplate extends BaseTemplate {
type: 'copy';
lookBack: number;
}
diff --git a/packages/loot-core/src/types/models/user-access.d.ts b/packages/loot-core/src/types/models/user-access.ts
similarity index 100%
rename from packages/loot-core/src/types/models/user-access.d.ts
rename to packages/loot-core/src/types/models/user-access.ts
diff --git a/packages/loot-core/src/types/models/user.d.ts b/packages/loot-core/src/types/models/user.ts
similarity index 100%
rename from packages/loot-core/src/types/models/user.d.ts
rename to packages/loot-core/src/types/models/user.ts
diff --git a/packages/loot-core/tsconfig.api.json b/packages/loot-core/tsconfig.api.json
index 6e6c7fd521..56ea2d8cdc 100644
--- a/packages/loot-core/tsconfig.api.json
+++ b/packages/loot-core/tsconfig.api.json
@@ -1,7 +1,7 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
- "rootDir": "./src",
+ "rootDir": ".",
"declaration": true,
"emitDeclarationOnly": true,
"allowJs": false,
diff --git a/packages/loot-core/typings/pegjs.d.ts b/packages/loot-core/typings/pegjs.ts
similarity index 100%
rename from packages/loot-core/typings/pegjs.d.ts
rename to packages/loot-core/typings/pegjs.ts
diff --git a/packages/loot-core/typings/vite-plugin-peggy-loader.d.ts b/packages/loot-core/typings/vite-plugin-peggy-loader.ts
similarity index 100%
rename from packages/loot-core/typings/vite-plugin-peggy-loader.d.ts
rename to packages/loot-core/typings/vite-plugin-peggy-loader.ts
diff --git a/packages/loot-core/typings/window.d.ts b/packages/loot-core/typings/window.ts
similarity index 81%
rename from packages/loot-core/typings/window.d.ts
rename to packages/loot-core/typings/window.ts
index 10fffd582f..c2aec13ee6 100644
--- a/packages/loot-core/typings/window.d.ts
+++ b/packages/loot-core/typings/window.ts
@@ -1,5 +1,14 @@
+// @ts-strict-ignore
export {};
+type FileDialogOptions = {
+ properties?: Array<'openFile' | 'openDirectory'>;
+ filters?: {
+ name: string;
+ extensions: string[];
+ }[];
+};
+
type Actual = {
IS_DEV: boolean;
ACTUAL_VERSION: string;
@@ -9,7 +18,7 @@ type Actual = {
filename: string,
dialogTitle?: string,
) => Promise<void>;
- openFileDialog: (options) => Promise<string[]>;
+ openFileDialog: (options: FileDialogOptions) => Promise<string[]>;
relaunch: () => void;
reload: (() => Promise<void>) | undefined;
restartElectronServer: () => void;
@@ -20,7 +29,7 @@ type Actual = {
applyAppUpdate: () => Promise<void>;
updateAppMenu: (budgetId: string) => void;
ipcConnect: (callback: (client) => void) => void;
- getServerSocket: () => Promise<string | null>;
+ getServerSocket: () => Promise<Worker | null>;
setTheme: (theme: string) => void;
logToTerminal: (...args: unknown[]) => void;
onEventFromMain: (
diff --git a/upcoming-release-notes/5060.md b/upcoming-release-notes/5060.md
new file mode 100644
index 0000000000..51f1dab2a9
--- /dev/null
+++ b/upcoming-release-notes/5060.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [jfdoming]
+---
+
+Move more .d.ts files to .ts