A local-first personal finance app
[AI] Enable subpath imports across all packages (#7462)
Matiss Janis Aboltins65b154151f8f
diff --git a/.oxlintrc.json b/.oxlintrc.jsonindex 29a1e9f8ab..1628fbcac4 100644--- a/.oxlintrc.json+++ b/.oxlintrc.json@@ -36,6 +36,7 @@"actual/prefer-const": "error","actual/no-anchor-tag": "error","actual/no-react-default-import": "error",+ "actual/prefer-subpath-imports": "error",// JSX A11y rules"jsx-a11y/no-autofocus": [@@ -396,15 +397,6 @@"actual/no-anchor-tag": "off"}},- {- "files": [- "packages/loot-core/src/**/*.{ts,tsx}",- "packages/desktop-client/src/**/*.{ts,tsx}"- ],- "rules": {- "actual/prefer-subpath-imports": "error"- }- },{"files": ["packages/desktop-client/**/*.{js,ts,jsx,tsx}"],"rules": {diff --git a/packages/cli/package.json b/packages/cli/package.jsonindex 7d5b334837..232796f8da 100644--- a/packages/cli/package.json+++ b/packages/cli/package.json@@ -11,6 +11,14 @@"dist"],"type": "module",+ "imports": {+ "#commands/*": "./src/commands/*.ts",+ "#config": "./src/config.ts",+ "#connection": "./src/connection.ts",+ "#input": "./src/input.ts",+ "#output": "./src/output.ts",+ "#utils": "./src/utils.ts"+ },"scripts": {"build": "vite build","test": "vitest --run",diff --git a/packages/cli/src/commands/accounts.test.ts b/packages/cli/src/commands/accounts.test.tsindex ab722c7f72..daf5713a57 100644--- a/packages/cli/src/commands/accounts.test.ts+++ b/packages/cli/src/commands/accounts.test.ts@@ -1,7 +1,7 @@import * as api from '@actual-app/api';import { Command } from 'commander';-import { printOutput } from '../output';+import { printOutput } from '#output';import { registerAccountsCommand } from './accounts';@@ -15,11 +15,11 @@ vi.mock('@actual-app/api', () => ({getAccountBalance: vi.fn().mockResolvedValue(10000),}));-vi.mock('../connection', () => ({+vi.mock('#connection', () => ({withConnection: vi.fn((_opts, fn) => fn()),}));-vi.mock('../output', () => ({+vi.mock('#output', () => ({printOutput: vi.fn(),}));diff --git a/packages/cli/src/commands/accounts.ts b/packages/cli/src/commands/accounts.tsindex f2a5a170d1..6571c326ce 100644--- a/packages/cli/src/commands/accounts.ts+++ b/packages/cli/src/commands/accounts.ts@@ -1,9 +1,9 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { printOutput } from '../output';-import { parseBoolFlag, parseIntFlag } from '../utils';+import { withConnection } from '#connection';+import { printOutput } from '#output';+import { parseBoolFlag, parseIntFlag } from '#utils';export function registerAccountsCommand(program: Command) {const accounts = program.command('accounts').description('Manage accounts');diff --git a/packages/cli/src/commands/budgets.ts b/packages/cli/src/commands/budgets.tsindex 7f7d5075e0..2a3dca8fae 100644--- a/packages/cli/src/commands/budgets.ts+++ b/packages/cli/src/commands/budgets.ts@@ -1,10 +1,10 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { resolveConfig } from '../config';-import { withConnection } from '../connection';-import { printOutput } from '../output';-import { parseBoolFlag, parseIntFlag } from '../utils';+import { resolveConfig } from '#config';+import { withConnection } from '#connection';+import { printOutput } from '#output';+import { parseBoolFlag, parseIntFlag } from '#utils';export function registerBudgetsCommand(program: Command) {const budgets = program.command('budgets').description('Manage budgets');diff --git a/packages/cli/src/commands/categories.ts b/packages/cli/src/commands/categories.tsindex d18a3dea89..e3cd9ea013 100644--- a/packages/cli/src/commands/categories.ts+++ b/packages/cli/src/commands/categories.ts@@ -1,9 +1,9 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { printOutput } from '../output';-import { parseBoolFlag } from '../utils';+import { withConnection } from '#connection';+import { printOutput } from '#output';+import { parseBoolFlag } from '#utils';export function registerCategoriesCommand(program: Command) {const categories = programdiff --git a/packages/cli/src/commands/category-groups.ts b/packages/cli/src/commands/category-groups.tsindex adc8e147f3..0f16bce077 100644--- a/packages/cli/src/commands/category-groups.ts+++ b/packages/cli/src/commands/category-groups.ts@@ -1,9 +1,9 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { printOutput } from '../output';-import { parseBoolFlag } from '../utils';+import { withConnection } from '#connection';+import { printOutput } from '#output';+import { parseBoolFlag } from '#utils';export function registerCategoryGroupsCommand(program: Command) {const groups = programdiff --git a/packages/cli/src/commands/payees.ts b/packages/cli/src/commands/payees.tsindex f569f983ec..0ab268d3c3 100644--- a/packages/cli/src/commands/payees.ts+++ b/packages/cli/src/commands/payees.ts@@ -1,8 +1,8 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { printOutput } from '../output';+import { withConnection } from '#connection';+import { printOutput } from '#output';export function registerPayeesCommand(program: Command) {const payees = program.command('payees').description('Manage payees');diff --git a/packages/cli/src/commands/query.test.ts b/packages/cli/src/commands/query.test.tsindex 37399e9c7c..c9169e5d85 100644--- a/packages/cli/src/commands/query.test.ts+++ b/packages/cli/src/commands/query.test.ts@@ -1,7 +1,7 @@import * as api from '@actual-app/api';import { Command } from 'commander';-import { printOutput } from '../output';+import { printOutput } from '#output';import { parseOrderBy, registerQueryCommand } from './query';@@ -21,11 +21,11 @@ vi.mock('@actual-app/api', () => {};});-vi.mock('../connection', () => ({+vi.mock('#connection', () => ({withConnection: vi.fn((_opts, fn) => fn()),}));-vi.mock('../output', () => ({+vi.mock('#output', () => ({printOutput: vi.fn(),}));diff --git a/packages/cli/src/commands/query.ts b/packages/cli/src/commands/query.tsindex f2fa67b56e..707f29825e 100644--- a/packages/cli/src/commands/query.ts+++ b/packages/cli/src/commands/query.ts@@ -1,10 +1,10 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { readJsonInput } from '../input';-import { printOutput } from '../output';-import { isRecord, parseIntFlag } from '../utils';+import { withConnection } from '#connection';+import { readJsonInput } from '#input';+import { printOutput } from '#output';+import { isRecord, parseIntFlag } from '#utils';/*** Parse order-by strings like "date:desc,amount:asc,id" intodiff --git a/packages/cli/src/commands/rules.ts b/packages/cli/src/commands/rules.tsindex ef81cd7438..c87b21bf0e 100644--- a/packages/cli/src/commands/rules.ts+++ b/packages/cli/src/commands/rules.ts@@ -1,9 +1,9 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { readJsonInput } from '../input';-import { printOutput } from '../output';+import { withConnection } from '#connection';+import { readJsonInput } from '#input';+import { printOutput } from '#output';export function registerRulesCommand(program: Command) {const rules = programdiff --git a/packages/cli/src/commands/schedules.ts b/packages/cli/src/commands/schedules.tsindex a7f834ddd8..8d82bf5325 100644--- a/packages/cli/src/commands/schedules.ts+++ b/packages/cli/src/commands/schedules.ts@@ -1,9 +1,9 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { readJsonInput } from '../input';-import { printOutput } from '../output';+import { withConnection } from '#connection';+import { readJsonInput } from '#input';+import { printOutput } from '#output';export function registerSchedulesCommand(program: Command) {const schedules = programdiff --git a/packages/cli/src/commands/server.ts b/packages/cli/src/commands/server.tsindex f151ce46df..31aaacbe51 100644--- a/packages/cli/src/commands/server.ts+++ b/packages/cli/src/commands/server.ts@@ -2,8 +2,8 @@ import * as api from '@actual-app/api';import { Option } from 'commander';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { printOutput } from '../output';+import { withConnection } from '#connection';+import { printOutput } from '#output';export function registerServerCommand(program: Command) {const server = program.command('server').description('Server utilities');diff --git a/packages/cli/src/commands/tags.ts b/packages/cli/src/commands/tags.tsindex b730fde798..9cb9698999 100644--- a/packages/cli/src/commands/tags.ts+++ b/packages/cli/src/commands/tags.ts@@ -1,8 +1,8 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { printOutput } from '../output';+import { withConnection } from '#connection';+import { printOutput } from '#output';export function registerTagsCommand(program: Command) {const tags = program.command('tags').description('Manage tags');diff --git a/packages/cli/src/commands/transactions.ts b/packages/cli/src/commands/transactions.tsindex fbc9ca8d3f..2da879b3cd 100644--- a/packages/cli/src/commands/transactions.ts+++ b/packages/cli/src/commands/transactions.ts@@ -1,9 +1,9 @@import * as api from '@actual-app/api';import type { Command } from 'commander';-import { withConnection } from '../connection';-import { readJsonInput } from '../input';-import { printOutput } from '../output';+import { withConnection } from '#connection';+import { readJsonInput } from '#input';+import { printOutput } from '#output';export function registerTransactionsCommand(program: Command) {const transactions = programdiff --git a/packages/component-library/package.json b/packages/component-library/package.jsonindex cdf39f4b6d..48de69beb4 100644--- a/packages/component-library/package.json+++ b/packages/component-library/package.json@@ -2,6 +2,9 @@"name": "@actual-app/components","version": "0.0.1","license": "MIT",+ "imports": {+ "#tokens": "./src/tokens.ts"+ },"exports": {"./hooks/*": "./src/hooks/*.ts","./icons/logo": "./src/icons/logo/index.ts",diff --git a/packages/component-library/src/hooks/useResponsive.ts b/packages/component-library/src/hooks/useResponsive.tsindex 9ca85a6673..481d793a0e 100644--- a/packages/component-library/src/hooks/useResponsive.ts+++ b/packages/component-library/src/hooks/useResponsive.ts@@ -1,6 +1,6 @@import { useWindowSize } from 'usehooks-ts';-import { breakpoints } from '../tokens';+import { breakpoints } from '#tokens';export function useResponsive() {const { height, width } = useWindowSize({diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.jsonindex 8287d616d5..58863a93a1 100644--- a/packages/desktop-client/package.json+++ b/packages/desktop-client/package.json@@ -27,7 +27,9 @@"#mocks": "./src/mocks.tsx","#polyfills": "./src/polyfills.ts","#components/forms": "./src/components/forms/index.tsx",+ "#components/banksync": "./src/components/banksync/index.tsx","#components/banksync/useBankSyncAccountSettings": "./src/components/banksync/useBankSyncAccountSettings.ts",+ "#components/budget": "./src/components/budget/index.tsx","#components/budget/goals/actions": "./src/components/budget/goals/actions.ts","#components/budget/goals/constants": "./src/components/budget/goals/constants.ts","#components/budget/goals/reducer": "./src/components/budget/goals/reducer.ts",@@ -50,6 +52,7 @@"#components/reports/useDashboardWidgetCopyMenu": "./src/components/reports/useDashboardWidgetCopyMenu.ts","#components/reports/useReport": "./src/components/reports/useReport.ts","#components/reports/util": "./src/components/reports/util.ts",+ "#components/schedules": "./src/components/schedules/index.tsx","#components/schedules/schedule-edit-utils": "./src/components/schedules/schedule-edit-utils.ts","#components/util/accountValidation": "./src/components/util/accountValidation.ts","#components/util/countries": "./src/components/util/countries.ts",diff --git a/packages/desktop-client/src/components/responsive/narrow.ts b/packages/desktop-client/src/components/responsive/narrow.tsindex 9ca5e6b14a..6d50e47816 100644--- a/packages/desktop-client/src/components/responsive/narrow.ts+++ b/packages/desktop-client/src/components/responsive/narrow.ts@@ -1,17 +1,17 @@-export { BudgetPage as Budget } from '../mobile/budget/BudgetPage';+export { BudgetPage as Budget } from '#components/mobile/budget/BudgetPage';-export { AccountsPage as Accounts } from '../mobile/accounts/AccountsPage';-export { AccountPage as Account } from '../mobile/accounts/AccountPage';+export { AccountsPage as Accounts } from '#components/mobile/accounts/AccountsPage';+export { AccountPage as Account } from '#components/mobile/accounts/AccountPage';-export { MobileRulesPage as Rules } from '../mobile/rules/MobileRulesPage';-export { MobileRuleEditPage as RuleEdit } from '../mobile/rules/MobileRuleEditPage';+export { MobileRulesPage as Rules } from '#components/mobile/rules/MobileRulesPage';+export { MobileRuleEditPage as RuleEdit } from '#components/mobile/rules/MobileRuleEditPage';-export { MobileSchedulesPage as Schedules } from '../mobile/schedules/MobileSchedulesPage';-export { MobileScheduleEditPage as ScheduleEdit } from '../mobile/schedules/MobileScheduleEditPage';+export { MobileSchedulesPage as Schedules } from '#components/mobile/schedules/MobileSchedulesPage';+export { MobileScheduleEditPage as ScheduleEdit } from '#components/mobile/schedules/MobileScheduleEditPage';-export { CategoryPage as Category } from '../mobile/budget/CategoryPage';-export { MobilePayeesPage as Payees } from '../mobile/payees/MobilePayeesPage';-export { MobilePayeeEditPage as PayeeEdit } from '../mobile/payees/MobilePayeeEditPage';+export { CategoryPage as Category } from '#components/mobile/budget/CategoryPage';+export { MobilePayeesPage as Payees } from '#components/mobile/payees/MobilePayeesPage';+export { MobilePayeeEditPage as PayeeEdit } from '#components/mobile/payees/MobilePayeeEditPage';-export { MobileBankSyncPage as BankSync } from '../mobile/banksync/MobileBankSyncPage';-export { MobileBankSyncAccountEditPage as BankSyncAccountEdit } from '../mobile/banksync/MobileBankSyncAccountEditPage';+export { MobileBankSyncPage as BankSync } from '#components/mobile/banksync/MobileBankSyncPage';+export { MobileBankSyncAccountEditPage as BankSyncAccountEdit } from '#components/mobile/banksync/MobileBankSyncAccountEditPage';diff --git a/packages/desktop-client/src/components/responsive/wide.ts b/packages/desktop-client/src/components/responsive/wide.tsindex 0dd07f5c02..b1f8b7cec9 100644--- a/packages/desktop-client/src/components/responsive/wide.ts+++ b/packages/desktop-client/src/components/responsive/wide.ts@@ -1,22 +1,22 @@-export { Budget } from '../budget';+export { Budget } from '#components/budget';-export { Schedules } from '../schedules';-export { Schedules as ScheduleEdit } from '../schedules';+export { Schedules } from '#components/schedules';+export { Schedules as ScheduleEdit } from '#components/schedules';-export { GoCardlessLink } from '../gocardless/GoCardlessLink';+export { GoCardlessLink } from '#components/gocardless/GoCardlessLink';-export { Account as Accounts } from '../accounts/Account';-export { Account } from '../accounts/Account';+export { Account as Accounts } from '#components/accounts/Account';+export { Account } from '#components/accounts/Account';-export { ManageRulesPage as Rules } from '../ManageRulesPage';-export { ManageRulesPage as RuleEdit } from '../ManageRulesPage';-export { ManagePayeesPage as Payees } from '../payees/ManagePayeesPage';-export { ManagePayeesPage as PayeeEdit } from '../payees/ManagePayeesPage';+export { ManageRulesPage as Rules } from '#components/ManageRulesPage';+export { ManageRulesPage as RuleEdit } from '#components/ManageRulesPage';+export { ManagePayeesPage as Payees } from '#components/payees/ManagePayeesPage';+export { ManagePayeesPage as PayeeEdit } from '#components/payees/ManagePayeesPage';-export { BankSync } from '../banksync';+export { BankSync } from '#components/banksync';-export { UserDirectoryPage } from '../admin/UserDirectory/UserDirectoryPage';+export { UserDirectoryPage } from '#components/admin/UserDirectory/UserDirectoryPage';// Account component is currently used for uncategorized transactions view.// Need to separate this to it's own component in the future.-export { Account as Category } from '../accounts/Account';+export { Account as Category } from '#components/accounts/Account';diff --git a/packages/eslint-plugin-actual/lib/rules/prefer-subpath-imports.js b/packages/eslint-plugin-actual/lib/rules/prefer-subpath-imports.jsindex ca7e5e470f..528bb7dc6b 100644--- a/packages/eslint-plugin-actual/lib/rules/prefer-subpath-imports.js+++ b/packages/eslint-plugin-actual/lib/rules/prefer-subpath-imports.js@@ -6,7 +6,7 @@ module.exports = {type: 'suggestion',docs: {description:- 'Prefer subpath imports (#path/to/module) over relative backtracked imports (../path/to/module) in loot-core',+ 'Prefer subpath imports (#path/to/module) over relative backtracked imports (../path/to/module)',},fixable: 'code',schema: [],@@ -20,19 +20,17 @@ module.exports = {const filenameRaw = context.getFilename();const normalizedFilename = filenameRaw.replace(/\\/g, '/');- // Only apply to files inside packages/loot-core/src/- const lootCoreMatch = normalizedFilename.match(- /packages\/loot-core\/src\//,- );- if (!lootCoreMatch) {+ // Only apply to files inside packages/*/src/+ const pkgMatch = normalizedFilename.match(/packages\/[^/]+\/src\//);+ if (!pkgMatch) {return {};}// Get the absolute path to the src/ directory- const srcIndex =- normalizedFilename.indexOf('packages/loot-core/src/') +- 'packages/loot-core/src/'.length;- const srcDir = normalizedFilename.slice(0, srcIndex);+ const srcDir = normalizedFilename.slice(+ 0,+ pkgMatch.index + pkgMatch[0].length,+ );function getSubpathImport(importSource) {// Only transform backtracked imports@@ -44,12 +42,18 @@ module.exports = {const resolved = path.posix.join(fileDir, importSource);// Check that the resolved path is inside src/- if (!resolved.startsWith(srcDir.slice(0, -1))) {+ const srcRoot = srcDir.slice(0, -1);+ const relativeToSrc = path.posix.relative(srcRoot, resolved);+ if (+ relativeToSrc === '' ||+ relativeToSrc.startsWith('..') ||+ path.posix.isAbsolute(relativeToSrc)+ ) {return null;}// Get path relative to src/- let subpath = resolved.slice(srcDir.length);+ let subpath = relativeToSrc;// Strip file extensionssubpath = subpath.replace(/\.(ts|tsx|js|jsx)$/, '');diff --git a/packages/sync-server/package.json b/packages/sync-server/package.jsonindex 8c0b2fa4c2..ea053f3575 100644--- a/packages/sync-server/package.json+++ b/packages/sync-server/package.json@@ -12,6 +12,54 @@"README.md"],"type": "module",+ "imports": {+ "#account-db": "./src/account-db.js",+ "#load-config": "./src/load-config.js",+ "#migrations": "./src/migrations.ts",+ "#accounts/*": "./src/accounts/*.js",+ "#app-gocardless/banks/bank.interface": "./src/app-gocardless/banks/bank.interface.ts",+ "#app-gocardless/banks/*": "./src/app-gocardless/banks/*.js",+ "#app-gocardless/errors": "./src/app-gocardless/errors.ts",+ "#app-gocardless/gocardless-node.types": "./src/app-gocardless/gocardless-node.types.ts",+ "#app-gocardless/gocardless.types": "./src/app-gocardless/gocardless.types.ts",+ "#app-gocardless/services/*": "./src/app-gocardless/services/*.ts",+ "#app-gocardless/services/tests/*": "./src/app-gocardless/services/tests/*.js",+ "#app-gocardless/util/*": "./src/app-gocardless/util/*.js",+ "#app-gocardless/*": "./src/app-gocardless/*.js",+ "#app-pluggyai/*": "./src/app-pluggyai/*.js",+ "#app-simplefin/*": "./src/app-simplefin/*.js",+ "#app-sync/services/*": "./src/app-sync/services/*.js",+ "#app-sync/*": "./src/app-sync/*.js",+ "#scripts/*": "./src/scripts/*.js",+ "#services/*": "./src/services/*.js",+ "#util/title": "./src/util/title/index.js",+ "#util/*": "./src/util/*.ts"+ },+ "publishConfig": {+ "imports": {+ "#account-db": "./build/src/account-db.js",+ "#load-config": "./build/src/load-config.js",+ "#migrations": "./build/src/migrations.js",+ "#accounts/*": "./build/src/accounts/*.js",+ "#app-gocardless/banks/bank.interface": "./build/src/app-gocardless/banks/bank.interface.js",+ "#app-gocardless/banks/*": "./build/src/app-gocardless/banks/*.js",+ "#app-gocardless/errors": "./build/src/app-gocardless/errors.js",+ "#app-gocardless/gocardless-node.types": "./build/src/app-gocardless/gocardless-node.types.js",+ "#app-gocardless/gocardless.types": "./build/src/app-gocardless/gocardless.types.js",+ "#app-gocardless/services/*": "./build/src/app-gocardless/services/*.js",+ "#app-gocardless/services/tests/*": "./build/src/app-gocardless/services/tests/*.js",+ "#app-gocardless/util/*": "./build/src/app-gocardless/util/*.js",+ "#app-gocardless/*": "./build/src/app-gocardless/*.js",+ "#app-pluggyai/*": "./build/src/app-pluggyai/*.js",+ "#app-simplefin/*": "./build/src/app-simplefin/*.js",+ "#app-sync/services/*": "./build/src/app-sync/services/*.js",+ "#app-sync/*": "./build/src/app-sync/*.js",+ "#scripts/*": "./build/src/scripts/*.js",+ "#services/*": "./build/src/services/*.js",+ "#util/title": "./build/src/util/title/index.js",+ "#util/*": "./build/src/util/*.js"+ }+ },"scripts": {"start": "yarn build && node build/app","start-monitor": "nodemon --exec 'yarn build && node build/app' --ignore './build/**/*' --ext 'ts,js' build/app",diff --git a/packages/sync-server/src/accounts/openid.js b/packages/sync-server/src/accounts/openid.jsindex 660cde31e0..f14c19f8fc 100644--- a/packages/sync-server/src/accounts/openid.js+++ b/packages/sync-server/src/accounts/openid.js@@ -5,13 +5,13 @@ import {clearExpiredSessions,getAccountDb,listLoginMethods,-} from '../account-db';-import { config } from '../load-config';+} from '#account-db';+import { config } from '#load-config';import {getUserByUsername,transferAllFilesFromUser,-} from '../services/user-service';-import { TOKEN_EXPIRATION_NEVER } from '../util/validate-user';+} from '#services/user-service';+import { TOKEN_EXPIRATION_NEVER } from '#util/validate-user';import { checkPassword } from './password';diff --git a/packages/sync-server/src/accounts/password.js b/packages/sync-server/src/accounts/password.jsindex 81407c52ee..9ff3e1adae 100644--- a/packages/sync-server/src/accounts/password.js+++ b/packages/sync-server/src/accounts/password.js@@ -1,9 +1,9 @@import * as bcrypt from 'bcrypt';import { v4 as uuidv4 } from 'uuid';-import { clearExpiredSessions, getAccountDb } from '../account-db';-import { config } from '../load-config';-import { TOKEN_EXPIRATION_NEVER } from '../util/validate-user';+import { clearExpiredSessions, getAccountDb } from '#account-db';+import { config } from '#load-config';+import { TOKEN_EXPIRATION_NEVER } from '#util/validate-user';function isValidPassword(password) {return password != null && password !== '';diff --git a/packages/sync-server/src/app-gocardless/app-gocardless.js b/packages/sync-server/src/app-gocardless/app-gocardless.jsindex b6f8edf905..f623fb956f 100644--- a/packages/sync-server/src/app-gocardless/app-gocardless.js+++ b/packages/sync-server/src/app-gocardless/app-gocardless.js@@ -2,11 +2,11 @@ import path from 'path';import express from 'express';-import { sha256String } from '../util/hash';+import { sha256String } from '#util/hash';import {requestLoggerMiddleware,validateSessionMiddleware,-} from '../util/middlewares';+} from '#util/middlewares';import {AccountNotLinkedToRequisition,diff --git a/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js b/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.jsindex 3da4707ae7..cdfebfade2 100644--- a/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js+++ b/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.js b/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.jsindex 4bb2d5d50f..1b31722751 100644--- a/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.js+++ b/packages/sync-server/src/app-gocardless/banks/american_express_aesudef1.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts b/packages/sync-server/src/app-gocardless/banks/bank.interface.tsindex 1fe07754b8..ea0df4d644 100644--- a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts+++ b/packages/sync-server/src/app-gocardless/banks/bank.interface.ts@@ -1,8 +1,11 @@-import type { Balance, Transaction } from '../gocardless-node.types';+import type {+ Balance,+ Transaction,+} from '#app-gocardless/gocardless-node.types';import type {DetailedAccountWithInstitution,NormalizedAccountDetails,-} from '../gocardless.types';+} from '#app-gocardless/gocardless.types';type TransactionExtended = Transaction & {date?: string;diff --git a/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.js b/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.jsindex 8a6f0d9c02..b5cdde5444 100644--- a/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.js+++ b/packages/sync-server/src/app-gocardless/banks/berliner_sparkasse_beladebexxx.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js b/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.jsindex c9da3de4dd..004267bdfe 100644--- a/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js+++ b/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js@@ -1,4 +1,4 @@-import { title } from '../../util/title/index';+import { title } from '#util/title';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/danskebank_privat.js b/packages/sync-server/src/app-gocardless/banks/danskebank_privat.jsindex 76a12176bc..8e75af6a85 100644--- a/packages/sync-server/src/app-gocardless/banks/danskebank_privat.js+++ b/packages/sync-server/src/app-gocardless/banks/danskebank_privat.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js b/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.jsindex 8bba4fce18..0562bc2091 100644--- a/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js+++ b/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js@@ -1,5 +1,5 @@-import { formatPayeeName } from '../../util/payee-name';-import { title } from '../../util/title/index';+import { formatPayeeName } from '#util/payee-name';+import { title } from '#util/title';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js b/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.jsindex 1ad05a2817..f2a8443772 100644--- a/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js+++ b/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js b/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.jsindex 9871566ddf..06d61e83f4 100644--- a/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js+++ b/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.js b/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.jsindex 6a4f01aa44..5998560624 100644--- a/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.js+++ b/packages/sync-server/src/app-gocardless/banks/ing_pl_ingbplpw.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/integration-bank.js b/packages/sync-server/src/app-gocardless/banks/integration-bank.jsindex 9f97cea192..694393e5be 100644--- a/packages/sync-server/src/app-gocardless/banks/integration-bank.js+++ b/packages/sync-server/src/app-gocardless/banks/integration-bank.js@@ -1,11 +1,11 @@import * as d from 'date-fns';-import { formatPayeeName } from '../../util/payee-name';import {amountToInteger,printIban,sortByBookingDateOrValueDate,-} from '../utils';+} from '#app-gocardless/utils';+import { formatPayeeName } from '#util/payee-name';const SORTED_BALANCE_TYPE_LIST = ['closingBooked',diff --git a/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.js b/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.jsindex 9bf0282d76..5f9086884d 100644--- a/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.js+++ b/packages/sync-server/src/app-gocardless/banks/mbank_retail_brexplpw.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js b/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.jsindex e4d831087d..840de670ca 100644--- a/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js+++ b/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.js b/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.jsindex 0c30aa091f..205ecd2247 100644--- a/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.js+++ b/packages/sync-server/src/app-gocardless/banks/norwegian_xx_norwnok1.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.js b/packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.jsindex 21d645a626..fd42ede7ab 100644--- a/packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.js+++ b/packages/sync-server/src/app-gocardless/banks/raiffeisen_at_rzbaatww.js@@ -1,5 +1,5 @@-import { formatPayeeName } from '../../util/payee-name';-import { title } from '../../util/title/index';+import { formatPayeeName } from '#util/payee-name';+import { title } from '#util/title';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js b/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.jsindex 8e0db8422a..7228c92f11 100644--- a/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js+++ b/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.js b/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.jsindex 012bbb2f00..916acf96a3 100644--- a/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.js+++ b/packages/sync-server/src/app-gocardless/banks/seb_kort_bank_ab.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/seb_privat.js b/packages/sync-server/src/app-gocardless/banks/seb_privat.jsindex b4fd4e554d..f52fcb8b61 100644--- a/packages/sync-server/src/app-gocardless/banks/seb_privat.js+++ b/packages/sync-server/src/app-gocardless/banks/seb_privat.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.js b/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.jsindex b0166397de..35bfd714ac 100644--- a/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.js+++ b/packages/sync-server/src/app-gocardless/banks/spk_karlsruhe_karsde66.js@@ -1,4 +1,4 @@-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';diff --git a/packages/sync-server/src/app-gocardless/banks/ssk_munchen.js b/packages/sync-server/src/app-gocardless/banks/ssk_munchen.jsindex 75fe359b5b..4a2656dd90 100644--- a/packages/sync-server/src/app-gocardless/banks/ssk_munchen.js+++ b/packages/sync-server/src/app-gocardless/banks/ssk_munchen.js@@ -1,7 +1,7 @@/*** Credit for this code goes to Nebukadneza at https://github.com/Nebukadneza*/-import { amountToInteger } from '../utils';+import { amountToInteger } from '#app-gocardless/utils';import Fallback from './integration-bank';/** @type {import('./bank.interface').IBank} */diff --git a/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.jsindex 85a9b87405..fb321f61ec 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/abanca_caglesmm.spec.js@@ -1,5 +1,5 @@-import { mockTransactionAmount } from '../../services/tests/fixtures';-import Abanca from '../abanca_caglesmm';+import Abanca from '#app-gocardless/banks/abanca_caglesmm';+import { mockTransactionAmount } from '#app-gocardless/services/tests/fixtures';describe('Abanca', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.jsindex 2ee46083ef..dc65375fb5 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/abnamro_abnanl2a.spec.js@@ -1,4 +1,4 @@-import AbnamroAbnanl2a from '../abnamro_abnanl2a';+import AbnamroAbnanl2a from '#app-gocardless/banks/abnamro_abnanl2a';describe('AbnamroAbnanl2a', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.jsindex 8a1ee569d7..76238a16c3 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/bancsabadell_bsabesbbb.spec.js@@ -1,4 +1,4 @@-import Sabadell from '../bancsabadell_bsabesbbb';+import Sabadell from '#app-gocardless/banks/bancsabadell_bsabesbbb';describe('BancSabadell', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.jsindex 034135a603..7674067bc1 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/belfius_gkccbebb.spec.js@@ -1,5 +1,5 @@-import { mockTransactionAmount } from '../../services/tests/fixtures';-import Belfius from '../belfius_gkccbebb';+import Belfius from '#app-gocardless/banks/belfius_gkccbebb';+import { mockTransactionAmount } from '#app-gocardless/services/tests/fixtures';describe('Belfius', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.jsindex 88ae644534..7cdb1dd4d8 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/boursobank_bousfrppxxx.spec.js@@ -1,4 +1,4 @@-import BoursoBank from '../boursobank_bousfrppxxx';+import BoursoBank from '#app-gocardless/banks/boursobank_bousfrppxxx';describe('BoursoBank', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.jsindex c5b10a263e..ae2fe928b2 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/bper_retail_bpmoit22.spec.js@@ -1,4 +1,4 @@-import BperRetail from '../bper_retail_bpmoit22';+import BperRetail from '#app-gocardless/banks/bper_retail_bpmoit22';const bookingDate = '2025-09-17';diff --git a/packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.jsindex 452dca1c99..09a698165d 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/cbc_cregbebb.spec.js@@ -1,4 +1,4 @@-import CBCcregbebb from '../cbc_cregbebb';+import CBCcregbebb from '#app-gocardless/banks/cbc_cregbebb';describe('cbc_cregbebb', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.jsindex 4bd3451f99..b0fda780b1 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/commerzbank_cobadeff.spec.js@@ -1,4 +1,4 @@-import CommerzbankCobadeff from '../commerzbank_cobadeff';+import CommerzbankCobadeff from '#app-gocardless/banks/commerzbank_cobadeff';describe('CommerzbankCobadeff', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.jsindex 9d7daa22b7..034055303b 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/easybank_bawaatww.spec.js@@ -1,5 +1,5 @@-import { mockTransactionAmount } from '../../services/tests/fixtures';-import EasybankBawaatww from '../easybank_bawaatww';+import EasybankBawaatww from '#app-gocardless/banks/easybank_bawaatww';+import { mockTransactionAmount } from '#app-gocardless/services/tests/fixtures';describe('easybank', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.jsindex 979c2740ce..af707ec282 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/fortuneo_ftnofrp1xxx.spec.js@@ -1,4 +1,4 @@-import Fortuneo from '../fortuneo_ftnofrp1xxx';+import Fortuneo from '#app-gocardless/banks/fortuneo_ftnofrp1xxx';describe('Fortuneo', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.jsindex eb0c394f9d..1623590c8b 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/ing_ingddeff.spec.js@@ -1,4 +1,4 @@-import IngIngddeff from '../ing_ingddeff';+import IngIngddeff from '#app-gocardless/banks/ing_ingddeff';describe('IngIngddeff', () => {describe('#normalizeAccount', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.jsindex 470e30994b..1152c3acbd 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/ing_pl_ingbplpw.spec.js@@ -1,5 +1,5 @@-import { mockTransactionAmount } from '../../services/tests/fixtures';-import IngPlIngbplpw from '../ing_pl_ingbplpw';+import IngPlIngbplpw from '#app-gocardless/banks/ing_pl_ingbplpw';+import { mockTransactionAmount } from '#app-gocardless/services/tests/fixtures';describe('IngPlIngbplpw', () => {describe('#normalizeAccount', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.jsindex 480fd6210e..d1f56a6384 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/integration_bank.spec.js@@ -1,8 +1,8 @@+import IntegrationBank from '#app-gocardless/banks/integration-bank';import {mockExtendAccountsAboutInstitutions,mockInstitution,-} from '../../services/tests/fixtures';-import IntegrationBank from '../integration-bank';+} from '#app-gocardless/services/tests/fixtures';describe('IntegrationBank', () => {describe('normalizeAccount', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.jsindex de39f456ac..96d6976d94 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/kbc_kredbebb.spec.js@@ -1,4 +1,4 @@-import KBCkredbebb from '../kbc_kredbebb';+import KBCkredbebb from '#app-gocardless/banks/kbc_kredbebb';describe('kbc_kredbebb', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.jsindex a9ec6d5eee..3d296cc45b 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/lhv_lhvbee22.spec.js@@ -1,4 +1,4 @@-import LhvLhvbee22 from '../lhv_lhvbee22';+import LhvLhvbee22 from '#app-gocardless/banks/lhv_lhvbee22';describe('#normalizeTransaction', () => {const bookedCardTransaction = {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.jsindex e9f9f70c02..16a137a0d1 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/mbank_retail_brexplpw.spec.js@@ -1,4 +1,4 @@-import MbankRetailBrexplpw from '../mbank_retail_brexplpw';+import MbankRetailBrexplpw from '#app-gocardless/banks/mbank_retail_brexplpw';describe('MbankRetailBrexplpw', () => {describe('#normalizeAccount', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.jsindex 4ba0a236d5..0f2b5b3412 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/nationwide_naiagb21.spec.js@@ -1,5 +1,5 @@-import { mockTransactionAmount } from '../../services/tests/fixtures';-import Nationwide from '../nationwide_naiagb21';+import Nationwide from '#app-gocardless/banks/nationwide_naiagb21';+import { mockTransactionAmount } from '#app-gocardless/services/tests/fixtures';describe('Nationwide', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.jsindex 2a3cfaaaea..ebf80b3ac5 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/nbg_ethngraaxxx.spec.js@@ -1,4 +1,4 @@-import NbgEthngraaxxx from '../nbg_ethngraaxxx';+import NbgEthngraaxxx from '#app-gocardless/banks/nbg_ethngraaxxx';describe('NbgEthngraaxxx', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.jsindex 19ea8c9ca9..3c13f0a345 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/raiffeisen_at_rzbaatww.spec.js@@ -1,5 +1,5 @@-import { mockTransactionAmount } from '../../services/tests/fixtures';-import RaiffeisenAtRzbaatww from '../raiffeisen_at_rzbaatww';+import RaiffeisenAtRzbaatww from '#app-gocardless/banks/raiffeisen_at_rzbaatww';+import { mockTransactionAmount } from '#app-gocardless/services/tests/fixtures';describe('raiffeisen_at', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.jsindex afcbe4faeb..920b632931 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/revolut_revolt21.spec.js@@ -1,4 +1,4 @@-import RevolutRevolt21 from '../revolut_revolt21';+import RevolutRevolt21 from '#app-gocardless/banks/revolut_revolt21';describe('RevolutRevolt21', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.jsindex b70ea35f4f..40c9ff1a02 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/sandboxfinance_sfin0000.spec.js@@ -1,4 +1,4 @@-import SandboxfinanceSfin0000 from '../sandboxfinance_sfin0000';+import SandboxfinanceSfin0000 from '#app-gocardless/banks/sandboxfinance_sfin0000';describe('SandboxfinanceSfin0000', () => {describe('#normalizeAccount', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.jsindex 695710eab8..e7f95589c7 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/spk_marburg_biedenkopf_heladef1mar.spec.js@@ -1,4 +1,4 @@-import SpkMarburgBiedenkopfHeladef1mar from '../spk_marburg_biedenkopf_heladef1mar';+import SpkMarburgBiedenkopfHeladef1mar from '#app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar';describe('SpkMarburgBiedenkopfHeladef1mar', () => {describe('#normalizeAccount', () => {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.jsindex f9106edf8e..a2e2eff5b0 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/ssk_dusseldorf_dussdeddxxx.spec.js@@ -1,4 +1,4 @@-import SskDusseldorfDussdeddxxx from '../ssk_dusseldorf_dussdeddxxx';+import SskDusseldorfDussdeddxxx from '#app-gocardless/banks/ssk_dusseldorf_dussdeddxxx';describe('ssk_dusseldorf_dussdeddxxx', () => {let consoleSpy;diff --git a/packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.jsindex 38a0d5355f..be5e6f1a36 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/swedbank_habalv22.spec.js@@ -1,4 +1,4 @@-import SwedbankHabaLV22 from '../swedbank_habalv22';+import SwedbankHabaLV22 from '#app-gocardless/banks/swedbank_habalv22';describe('#normalizeTransaction', () => {const bookedCardTransaction = {diff --git a/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.js b/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.jsindex b246ad5194..b1c386fed8 100644--- a/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.js+++ b/packages/sync-server/src/app-gocardless/banks/tests/virgin_nrnbgb22.spec.js@@ -1,5 +1,5 @@-import { mockTransactionAmount } from '../../services/tests/fixtures';-import Virgin from '../virgin_nrnbgb22';+import Virgin from '#app-gocardless/banks/virgin_nrnbgb22';+import { mockTransactionAmount } from '#app-gocardless/services/tests/fixtures';describe('Virgin', () => {describe('#normalizeTransaction', () => {diff --git a/packages/sync-server/src/app-gocardless/gocardless-node.types.ts b/packages/sync-server/src/app-gocardless/gocardless-node.types.tsindex 528dfcaf40..c72682fe58 100644--- a/packages/sync-server/src/app-gocardless/gocardless-node.types.ts+++ b/packages/sync-server/src/app-gocardless/gocardless-node.types.ts@@ -1,4 +1,4 @@-import type { BrandedId } from '../util/types';+import type { BrandedId } from '#util/types';export type GoCardlessAccountId = BrandedId<'gocardless-account'>;export type GoCardlessRequisitionId = BrandedId<'gocardless-requisition'>;diff --git a/packages/sync-server/src/app-gocardless/services/gocardless-api.ts b/packages/sync-server/src/app-gocardless/services/gocardless-api.tsindex 485ade0693..b45d051643 100644--- a/packages/sync-server/src/app-gocardless/services/gocardless-api.ts+++ b/packages/sync-server/src/app-gocardless/services/gocardless-api.ts@@ -7,8 +7,11 @@ import type {GoCardlessRequisitionId,Institution,Requisition,-} from '../gocardless-node.types';-import type { GetBalances, GetTransactionsResponse } from '../gocardless.types';+} from '#app-gocardless/gocardless-node.types';+import type {+ GetBalances,+ GetTransactionsResponse,+} from '#app-gocardless/gocardless.types';const BASE_URL = 'https://bankaccountdata.gocardless.com/api/v2';const ALLOWED_ORIGIN = new URL(BASE_URL).origin;diff --git a/packages/sync-server/src/app-gocardless/services/gocardless-service.ts b/packages/sync-server/src/app-gocardless/services/gocardless-service.tsindex 2c4b26b42f..4d16b70663 100644--- a/packages/sync-server/src/app-gocardless/services/gocardless-service.ts+++ b/packages/sync-server/src/app-gocardless/services/gocardless-service.ts@@ -1,8 +1,10 @@import { v4 as uuidv4 } from 'uuid';-import { SecretName, secretsService } from '../../services/secrets-service';-import { BankFactory, isSpecialContinuousAccessBank } from '../bank-factory';-import type { IBank } from '../banks/bank.interface';+import {+ BankFactory,+ isSpecialContinuousAccessBank,+} from '#app-gocardless/bank-factory';+import type { IBank } from '#app-gocardless/banks/bank.interface';import {AccessDeniedError,AccountNotLinkedToRequisition,@@ -15,7 +17,7 @@ import {ResourceSuspended,ServiceError,UnknownError,-} from '../errors';+} from '#app-gocardless/errors';import type {Balance,GoCardlessAccountId,@@ -25,7 +27,7 @@ import type {Institution,Requisition,Transaction,-} from '../gocardless-node.types';+} from '#app-gocardless/gocardless-node.types';import type {CreateRequisitionParams,DetailedAccount,@@ -35,7 +37,8 @@ import type {GetTransactionsResponse,NormalizedAccountDetails,TransactionWithBookedStatus,-} from '../gocardless.types';+} from '#app-gocardless/gocardless.types';+import { SecretName, secretsService } from '#services/secrets-service';import type { AccountDetailsResponse, TokenResponse } from './gocardless-api';import { GoCardlessApi, GoCardlessApiError } from './gocardless-api';diff --git a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.jsindex 220060ebbe..2f7c834bd1 100644--- a/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js+++ b/packages/sync-server/src/app-gocardless/services/tests/gocardless-service.spec.js@@ -10,13 +10,13 @@ import {ResourceSuspended,ServiceError,UnknownError,-} from '../../errors';-import { GoCardlessApiError } from '../gocardless-api';+} from '#app-gocardless/errors';+import { GoCardlessApiError } from '#app-gocardless/services/gocardless-api';import {client,goCardlessService,handleGoCardlessError,-} from '../gocardless-service';+} from '#app-gocardless/services/gocardless-service';import {mockAccountDetails,diff --git a/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.js b/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.jsindex a3854e2a36..5d63423010 100644--- a/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.js+++ b/packages/sync-server/src/app-gocardless/tests/bank-factory.spec.js@@ -1,5 +1,5 @@-import { BankFactory, banks } from '../bank-factory';-import IntegrationBank from '../banks/integration-bank';+import { BankFactory, banks } from '#app-gocardless/bank-factory';+import IntegrationBank from '#app-gocardless/banks/integration-bank';describe('BankFactory', () => {it.each(banks.flatMap(bank => bank.institutionIds))(diff --git a/packages/sync-server/src/app-gocardless/tests/utils.spec.js b/packages/sync-server/src/app-gocardless/tests/utils.spec.jsindex cc2c3c2193..ddad7adbf0 100644--- a/packages/sync-server/src/app-gocardless/tests/utils.spec.js+++ b/packages/sync-server/src/app-gocardless/tests/utils.spec.js@@ -1,5 +1,5 @@-import { mockTransactionAmount } from '../services/tests/fixtures';-import { sortByBookingDateOrValueDate } from '../utils';+import { mockTransactionAmount } from '#app-gocardless/services/tests/fixtures';+import { sortByBookingDateOrValueDate } from '#app-gocardless/utils';describe('utils', () => {describe('#sortByBookingDate', () => {diff --git a/packages/sync-server/src/app-pluggyai/app-pluggyai.js b/packages/sync-server/src/app-pluggyai/app-pluggyai.jsindex 82c4ff7768..b33c55ee75 100644--- a/packages/sync-server/src/app-pluggyai/app-pluggyai.js+++ b/packages/sync-server/src/app-pluggyai/app-pluggyai.js@@ -1,11 +1,11 @@import express from 'express';-import { handleError } from '../app-gocardless/util/handle-error';-import { SecretName, secretsService } from '../services/secrets-service';+import { handleError } from '#app-gocardless/util/handle-error';+import { SecretName, secretsService } from '#services/secrets-service';import {requestLoggerMiddleware,validateSessionMiddleware,-} from '../util/middlewares';+} from '#util/middlewares';import { pluggyaiService } from './pluggyai-service';diff --git a/packages/sync-server/src/app-pluggyai/pluggyai-service.js b/packages/sync-server/src/app-pluggyai/pluggyai-service.jsindex 1f23e4fd8a..59645a379b 100644--- a/packages/sync-server/src/app-pluggyai/pluggyai-service.js+++ b/packages/sync-server/src/app-pluggyai/pluggyai-service.js@@ -1,6 +1,6 @@import { PluggyClient } from 'pluggy-sdk';-import { SecretName, secretsService } from '../services/secrets-service';+import { SecretName, secretsService } from '#services/secrets-service';let pluggyClient = null;diff --git a/packages/sync-server/src/app-simplefin/app-simplefin.js b/packages/sync-server/src/app-simplefin/app-simplefin.jsindex a35e54f82a..597f35f94e 100644--- a/packages/sync-server/src/app-simplefin/app-simplefin.js+++ b/packages/sync-server/src/app-simplefin/app-simplefin.js@@ -2,12 +2,12 @@ import https from 'https';import express from 'express';-import { handleError } from '../app-gocardless/util/handle-error';-import { SecretName, secretsService } from '../services/secrets-service';+import { handleError } from '#app-gocardless/util/handle-error';+import { SecretName, secretsService } from '#services/secrets-service';import {requestLoggerMiddleware,validateSessionMiddleware,-} from '../util/middlewares';+} from '#util/middlewares';const app = express();export { app as handlers };diff --git a/packages/sync-server/src/app-sync/services/files-service.js b/packages/sync-server/src/app-sync/services/files-service.jsindex 242dd90ad6..21c4e4494e 100644--- a/packages/sync-server/src/app-sync/services/files-service.js+++ b/packages/sync-server/src/app-sync/services/files-service.js@@ -1,5 +1,5 @@-import { getAccountDb, isAdmin } from '../../account-db';-import { FileNotFound, GenericFileError } from '../errors';+import { getAccountDb, isAdmin } from '#account-db';+import { FileNotFound, GenericFileError } from '#app-sync/errors';class FileBase {constructor(diff --git a/packages/sync-server/src/app-sync/tests/services/files-service.test.js b/packages/sync-server/src/app-sync/tests/services/files-service.test.jsindex 91f9a6214f..92c4e0605b 100644--- a/packages/sync-server/src/app-sync/tests/services/files-service.test.js+++ b/packages/sync-server/src/app-sync/tests/services/files-service.test.js@@ -1,8 +1,12 @@import crypto from 'node:crypto';-import { getAccountDb } from '../../../account-db';-import { FileNotFound } from '../../errors';-import { File, FilesService, FileUpdate } from '../../services/files-service'; // Adjust the path as necessary+import { getAccountDb } from '#account-db';+import { FileNotFound } from '#app-sync/errors';+import {+ File,+ FilesService,+ FileUpdate,+} from '#app-sync/services/files-service'; // Adjust the path as necessarydescribe('FilesService', () => {let filesService;let accountDb;diff --git a/packages/sync-server/src/scripts/disable-openid.js b/packages/sync-server/src/scripts/disable-openid.jsindex 5706db7f25..c1762e5483 100644--- a/packages/sync-server/src/scripts/disable-openid.js+++ b/packages/sync-server/src/scripts/disable-openid.js@@ -2,8 +2,8 @@ import {disableOpenID,getActiveLoginMethod,needsBootstrap,-} from '../account-db';-import { promptPassword } from '../util/prompt';+} from '#account-db';+import { promptPassword } from '#util/prompt';if (needsBootstrap()) {console.log('System needs to be bootstrapped first. OpenID is not enabled.');diff --git a/packages/sync-server/src/scripts/enable-openid.js b/packages/sync-server/src/scripts/enable-openid.jsindex dd69702ea3..eb02cb8f89 100644--- a/packages/sync-server/src/scripts/enable-openid.js+++ b/packages/sync-server/src/scripts/enable-openid.js@@ -2,8 +2,8 @@ import {enableOpenID,getActiveLoginMethod,needsBootstrap,-} from '../account-db';-import { config } from '../load-config';+} from '#account-db';+import { config } from '#load-config';if (needsBootstrap()) {console.log(diff --git a/packages/sync-server/src/scripts/health-check.js b/packages/sync-server/src/scripts/health-check.jsindex 0895a1793d..5b5a45dff0 100644--- a/packages/sync-server/src/scripts/health-check.js+++ b/packages/sync-server/src/scripts/health-check.js@@ -1,4 +1,4 @@-import { config } from '../load-config';+import { config } from '#load-config';const protocol =config.get('https.key') && config.get('https.cert') ? 'https' : 'http';diff --git a/packages/sync-server/src/scripts/reset-password.js b/packages/sync-server/src/scripts/reset-password.jsindex 9fb275f9c4..d3906c287e 100644--- a/packages/sync-server/src/scripts/reset-password.js+++ b/packages/sync-server/src/scripts/reset-password.js@@ -1,6 +1,6 @@-import { bootstrap, needsBootstrap } from '../account-db';-import { changePassword } from '../accounts/password';-import { promptPassword } from '../util/prompt';+import { bootstrap, needsBootstrap } from '#account-db';+import { changePassword } from '#accounts/password';+import { promptPassword } from '#util/prompt';if (needsBootstrap()) {console.log(diff --git a/packages/sync-server/src/scripts/run-migrations.js b/packages/sync-server/src/scripts/run-migrations.jsindex cd335d45a8..2ec32fb0b2 100644--- a/packages/sync-server/src/scripts/run-migrations.js+++ b/packages/sync-server/src/scripts/run-migrations.js@@ -1,4 +1,4 @@-import { run } from '../migrations';+import { run } from '#migrations';const direction = process.argv[2] || 'up';diff --git a/packages/sync-server/src/services/secrets-service.js b/packages/sync-server/src/services/secrets-service.jsindex 39ad30c05d..77b7005da2 100644--- a/packages/sync-server/src/services/secrets-service.js+++ b/packages/sync-server/src/services/secrets-service.js@@ -1,6 +1,6 @@import createDebug from 'debug';-import { getAccountDb } from '../account-db';+import { getAccountDb } from '#account-db';/*** An enum of valid secret names.diff --git a/packages/sync-server/src/services/user-service.js b/packages/sync-server/src/services/user-service.jsindex 11b43f95eb..8a86a21b68 100644--- a/packages/sync-server/src/services/user-service.js+++ b/packages/sync-server/src/services/user-service.js@@ -1,4 +1,4 @@-import { getAccountDb } from '../account-db';+import { getAccountDb } from '#account-db';export function getUserByUsername(userName) {if (!userName || typeof userName !== 'string') {diff --git a/packages/sync-server/src/util/paths.ts b/packages/sync-server/src/util/paths.tsindex 8eda2c0aac..e662d2fb39 100644--- a/packages/sync-server/src/util/paths.ts+++ b/packages/sync-server/src/util/paths.ts@@ -1,6 +1,6 @@import { join, resolve } from 'node:path';-import { config } from '../load-config';+import { config } from '#load-config';import type { BrandedId } from './types';diff --git a/packages/sync-server/src/util/payee-name.ts b/packages/sync-server/src/util/payee-name.tsindex 3cbfab279e..da18aabba6 100644--- a/packages/sync-server/src/util/payee-name.ts+++ b/packages/sync-server/src/util/payee-name.ts@@ -1,4 +1,4 @@-import type { Transaction } from '../app-gocardless/gocardless-node.types';+import type { Transaction } from '#app-gocardless/gocardless-node.types';import { title } from './title/index';diff --git a/packages/sync-server/src/util/validate-user.ts b/packages/sync-server/src/util/validate-user.tsindex 091a868b72..9a3b0df7b1 100644--- a/packages/sync-server/src/util/validate-user.ts+++ b/packages/sync-server/src/util/validate-user.ts@@ -1,8 +1,8 @@import type { Request, Response } from 'express';import ipaddr from 'ipaddr.js';-import { getSession } from '../account-db';-import { config } from '../load-config';+import { getSession } from '#account-db';+import { config } from '#load-config';export const TOKEN_EXPIRATION_NEVER = -1;const MS_PER_SECOND = 1000;diff --git a/upcoming-release-notes/7462.md b/upcoming-release-notes/7462.mdnew file mode 100644index 0000000000..0207e408d0--- /dev/null+++ b/upcoming-release-notes/7462.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MatissJanis]+---++Standardise module imports across all packages