A local-first personal finance app
Improve api output types (#2567)
DJ Mountney0f960df8cf3e
diff --git a/packages/api/tsconfig.dist.json b/packages/api/tsconfig.dist.jsonindex 4795f0c97e..d85cb67ca5 100644--- a/packages/api/tsconfig.dist.json+++ b/packages/api/tsconfig.dist.json@@ -10,6 +10,7 @@"outDir": "dist","declarationDir": "@types","paths": {+ "loot-core/src/*": ["./loot-core/*"],"loot-core/*": ["./@types/loot-core/*"],}},diff --git a/packages/loot-core/src/server/importers/ynab5.ts b/packages/loot-core/src/server/importers/ynab5.tsindex 30ab10224c..011b0d15ba 100644--- a/packages/loot-core/src/server/importers/ynab5.ts+++ b/packages/loot-core/src/server/importers/ynab5.ts@@ -8,6 +8,7 @@ import { v4 as uuidv4 } from 'uuid';import * as monthUtils from '../../shared/months';import { sortByKey, groupBy } from '../../shared/util';+import { CategoryGroupEntity } from '../../types/models';import { YNAB5 } from './ynab5-types';@@ -338,10 +339,16 @@ function equalsIgnoreCase(stringa: string, stringb: string): boolean {);}-function findByNameIgnoreCase(categories: YNAB5.CategoryGroup[], name: string) {+function findByNameIgnoreCase(+ categories: (YNAB5.CategoryGroup | CategoryGroupEntity)[],+ name: string,+) {return categories.find(cat => equalsIgnoreCase(cat.name, name));}-function findIdByName(categories: YNAB5.CategoryGroup[], name: string) {+function findIdByName(+ categories: (YNAB5.CategoryGroup | CategoryGroupEntity)[],+ name: string,+) {return findByNameIgnoreCase(categories, name)?.id;}diff --git a/packages/loot-core/src/types/api-handlers.d.ts b/packages/loot-core/src/types/api-handlers.d.tsindex 1f314fde6b..c1f42776f3 100644--- a/packages/loot-core/src/types/api-handlers.d.ts+++ b/packages/loot-core/src/types/api-handlers.d.ts@@ -1,5 +1,12 @@import { type batchUpdateTransactions } from '../server/accounts/transactions';+import type {+ TransactionEntity,+ AccountEntity,+ CategoryGroupEntity,+ CategoryEntity,+ PayeeEntity,+} from './models';import { type ServerHandlers } from './server-handlers';export interface ApiHandlers {@@ -107,7 +114,7 @@ export interface ApiHandlers {'api/categories-get': (arg: {grouped;- }) => Promise<Array<CategoryGroupEntity> | Array<CategoryEntity>>;+ }) => Promise<Array<CategoryGroupEntity | CategoryEntity>>;'api/category-groups-get': () => Promise<CategoryGroupEntity[]>;diff --git a/upcoming-release-notes/2567.md b/upcoming-release-notes/2567.mdnew file mode 100644index 0000000000..c73a7289cf--- /dev/null+++ b/upcoming-release-notes/2567.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [twk3]+---++Improve API output types.