From 0c95eb483897a2f5ba35962e4525f2149f1c000c Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Sat, 6 Dec 2025 03:23:44 +0000 Subject: [PATCH] Add ESM loader support and update sync-server modules (#6179) * Add ESM loader support and update sync-server modules * Update TypeScript configuration and fix bank file import filter in sync-server * Remove deprecated loader and register files, update TypeScript configuration to use ES2021, and add a new script for automatically adding import extensions to JavaScript files. * Update test script in package.json to include a custom loader and clean up import extensions script by removing unused 'stat' import. * feat: Add warning for unresolved imports Co-authored-by: matiss * [autofix.ci] apply automated fixes * Remove unused 'import/extensions' rule from ESLint configuration * Refactor import statements in sync-server - Updated import path for migrations to remove file extension. - Added ESLint directive to ignore import extension rule for reset-password script. --------- Co-authored-by: Cursor Agent Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> --- eslint.config.mjs | 1 - packages/sync-server/app.ts | 2 +- packages/sync-server/bin/actual-server.js | 1 + .../sync-server/bin/add-import-extensions.mjs | 102 ++++++++++++++++++ packages/sync-server/loader.mjs | 26 +++++ .../1694360000000-create-folders.js | 2 +- .../1694360479680-create-account-db.js | 2 +- .../1694362247011-create-secret-table.js | 2 +- .../1702667624000-rename-nordigen-secrets.js | 2 +- .../migrations/1718889148000-openid.js | 2 +- .../migrations/1719409568000-multiuser.js | 2 +- packages/sync-server/package.json | 7 +- packages/sync-server/register-loader.mjs | 9 ++ packages/sync-server/src/account-db.js | 8 +- packages/sync-server/src/accounts/openid.js | 10 +- packages/sync-server/src/accounts/password.js | 6 +- packages/sync-server/src/app-account.js | 13 +-- packages/sync-server/src/app-admin.js | 8 +- packages/sync-server/src/app-admin.test.js | 4 +- packages/sync-server/src/app-cors-proxy.js | 6 +- .../sync-server/src/app-cors-proxy.test.js | 12 +-- .../sync-server/src/app-gocardless/README.md | 2 +- .../src/app-gocardless/app-gocardless.js | 10 +- .../src/app-gocardless/bank-factory.js | 2 +- .../app-gocardless/banks/abanca_caglesmm.js | 4 +- .../app-gocardless/banks/abnamro_abnanl2a.js | 6 +- .../banks/american_express_aesudef1.js | 6 +- .../banks/bancsabadell_bsabesbbb.js | 4 +- .../app-gocardless/banks/bank.interface.ts | 4 +- .../banks/bank_of_ireland_b365_bofiie2d.js | 4 +- .../banks/bankinter_bkbkesmm.js | 4 +- .../app-gocardless/banks/belfius_gkccbebb.js | 4 +- .../banks/berliner_sparkasse_beladebexxx.js | 6 +- .../app-gocardless/banks/bnp_be_gebabebb.js | 4 +- .../banks/boursobank_bousfrppxxx.js | 6 +- .../banks/bper_retail_bpmoit22.js | 4 +- .../src/app-gocardless/banks/cbc_cregbebb.js | 6 +- .../banks/cetelem_cetmptp1xxx.js | 4 +- .../banks/commerzbank_cobadeff.js | 6 +- .../app-gocardless/banks/danskebank_privat.js | 6 +- .../banks/direkt_heladef1822.js | 4 +- .../app-gocardless/banks/easybank_bawaatww.js | 10 +- .../banks/entercard_swednokk.js | 6 +- .../banks/fortuneo_ftnofrp1xxx.js | 4 +- .../src/app-gocardless/banks/hype_hyeeit22.js | 4 +- .../src/app-gocardless/banks/ing_ingbrobu.js | 4 +- .../src/app-gocardless/banks/ing_ingddeff.js | 6 +- .../app-gocardless/banks/ing_pl_ingbplpw.js | 6 +- .../app-gocardless/banks/integration-bank.js | 6 +- .../app-gocardless/banks/isybank_itbbitmm.js | 4 +- .../src/app-gocardless/banks/kbc_kredbebb.js | 6 +- .../src/app-gocardless/banks/lhv-lhvbee22.js | 4 +- .../banks/mbank_retail_brexplpw.js | 6 +- .../banks/nationwide_naiagb21.js | 4 +- .../app-gocardless/banks/nbg_ethngraaxxx.js | 6 +- .../banks/norwegian_xx_norwnok1.js | 6 +- .../banks/raiffeisen_at_rzbaatww.js | 10 +- .../app-gocardless/banks/revolut_revolt21.js | 4 +- .../banks/sandboxfinance_sfin0000.js | 6 +- .../app-gocardless/banks/seb_kort_bank_ab.js | 6 +- .../src/app-gocardless/banks/seb_privat.js | 6 +- .../app-gocardless/banks/sparnord_spnodk22.js | 4 +- .../banks/spk_karlsruhe_karsde66.js | 6 +- .../spk_marburg_biedenkopf_heladef1mar.js | 4 +- .../banks/spk_worms_alzey_ried_malade51wor.js | 4 +- .../banks/ssk_dusseldorf_dussdeddxxx.js | 4 +- .../src/app-gocardless/banks/ssk_munchen.js | 6 +- .../app-gocardless/banks/swedbank_habalv22.js | 4 +- .../banks/tests/abanca_caglesmm.spec.js | 4 +- .../banks/tests/abnamro_abnanl2a.spec.js | 2 +- .../tests/bancsabadell_bsabesbbb.spec.js | 2 +- .../banks/tests/belfius_gkccbebb.spec.js | 4 +- .../tests/boursobank_bousfrppxxx.spec.js | 2 +- .../banks/tests/bper_retail_bpmoit22.spec.js | 2 +- .../banks/tests/cbc_cregbebb.spec.js | 2 +- .../banks/tests/commerzbank_cobadeff.spec.js | 2 +- .../banks/tests/easybank_bawaatww.spec.js | 4 +- .../banks/tests/fortuneo_ftnofrp1xxx.spec.js | 2 +- .../banks/tests/ing_ingddeff.spec.js | 6 +- .../banks/tests/ing_pl_ingbplpw.spec.js | 12 +-- .../banks/tests/integration_bank.spec.js | 8 +- .../banks/tests/kbc_kredbebb.spec.js | 2 +- .../banks/tests/lhv-lhvbee22.spec.js | 2 +- .../banks/tests/mbank_retail_brexplpw.spec.js | 6 +- .../banks/tests/nationwide_naiagb21.spec.js | 4 +- .../banks/tests/nbg_ethngraaxxx.spec.js | 2 +- .../tests/raiffeisen_at_rzbaatww.spec.js | 4 +- .../banks/tests/revolut_revolt21.spec.js | 2 +- .../tests/sandboxfinance_sfin0000.spec.js | 8 +- ...spk_marburg_biedenkopf_heladef1mar.spec.js | 6 +- .../tests/ssk_dusseldorf_dussdeddxxx.spec.js | 2 +- .../banks/tests/swedbank_habalv22.spec.js | 2 +- .../banks/tests/virgin_nrnbgb22.spec.js | 4 +- .../app-gocardless/banks/virgin_nrnbgb22.js | 4 +- .../src/app-gocardless/gocardless.types.ts | 2 +- .../services/gocardless-service.js | 36 +++---- .../app-gocardless/services/tests/fixtures.js | 20 ++-- .../services/tests/gocardless-service.spec.js | 6 +- .../app-gocardless/tests/bank-factory.spec.js | 4 +- .../src/app-gocardless/tests/utils.spec.js | 4 +- packages/sync-server/src/app-openid.js | 13 +-- .../src/app-pluggyai/app-pluggyai.js | 8 +- .../src/app-pluggyai/pluggyai-service.js | 2 +- packages/sync-server/src/app-secrets.js | 6 +- .../src/app-simplefin/app-simplefin.js | 6 +- packages/sync-server/src/app-sync.test.ts | 6 +- packages/sync-server/src/app-sync.ts | 16 +-- .../src/app-sync/services/files-service.js | 4 +- .../tests/services/files-service.test.js | 10 +- packages/sync-server/src/app.ts | 22 ++-- packages/sync-server/src/load-config.test.js | 2 +- packages/sync-server/src/migrations.js | 2 +- .../sync-server/src/scripts/disable-openid.js | 4 +- .../sync-server/src/scripts/enable-openid.js | 4 +- .../sync-server/src/scripts/health-check.js | 2 +- .../sync-server/src/scripts/reset-password.js | 6 +- .../sync-server/src/scripts/run-migrations.js | 2 +- packages/sync-server/src/secrets.test.js | 4 +- .../src/services/secrets-service.js | 2 +- .../sync-server/src/services/user-service.js | 2 +- packages/sync-server/src/sync-simple.js | 6 +- packages/sync-server/src/util/middlewares.js | 2 +- packages/sync-server/src/util/paths.js | 2 +- packages/sync-server/src/util/payee-name.js | 2 +- packages/sync-server/src/util/title/index.js | 4 +- .../sync-server/src/util/validate-user.js | 4 +- packages/sync-server/tsconfig.json | 3 - packages/sync-server/vitest.globalSetup.js | 4 +- upcoming-release-notes/6179.md | 6 ++ 129 files changed, 464 insertions(+), 333 deletions(-) create mode 100644 packages/sync-server/bin/add-import-extensions.mjs create mode 100644 packages/sync-server/loader.mjs create mode 100644 packages/sync-server/register-loader.mjs create mode 100644 upcoming-release-notes/6179.md diff --git a/eslint.config.mjs b/eslint.config.mjs index 4140ebccce..3a3a207c25 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -753,7 +753,6 @@ export default defineConfig( files: ['packages/sync-server/**/*'], // TODO: fix the issues in these files rules: { - 'import/extensions': 'off', 'actual/typography': 'off', }, }, diff --git a/packages/sync-server/app.ts b/packages/sync-server/app.ts index 62f5d1d7fa..1c788f84f3 100644 --- a/packages/sync-server/app.ts +++ b/packages/sync-server/app.ts @@ -1,4 +1,4 @@ -import { run as runMigrations } from './src/migrations.js'; +import { run as runMigrations } from './src/migrations'; runMigrations() .then(() => { diff --git a/packages/sync-server/bin/actual-server.js b/packages/sync-server/bin/actual-server.js index 0f59da406a..1c7de12467 100755 --- a/packages/sync-server/bin/actual-server.js +++ b/packages/sync-server/bin/actual-server.js @@ -118,6 +118,7 @@ if (values.config) { if (values['reset-password']) { console.info('Running reset password script...'); + // eslint-disable-next-line import/extensions await import('../src/scripts/reset-password.js'); process.exit(); } diff --git a/packages/sync-server/bin/add-import-extensions.mjs b/packages/sync-server/bin/add-import-extensions.mjs new file mode 100644 index 0000000000..54e0308080 --- /dev/null +++ b/packages/sync-server/bin/add-import-extensions.mjs @@ -0,0 +1,102 @@ +#!/usr/bin/env node +import { existsSync } from 'node:fs'; +import { readdir, readFile, writeFile } from 'node:fs/promises'; +import { join, dirname, extname, relative, resolve } from 'node:path'; +import { fileURLToPath } from 'node:url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); + +const buildDir = resolve(__dirname, '../build'); + +async function getAllJsFiles(dir) { + const files = []; + const entries = await readdir(dir, { withFileTypes: true }); + + for (const entry of entries) { + const fullPath = join(dir, entry.name); + if (entry.isDirectory()) { + files.push(...(await getAllJsFiles(fullPath))); + } else if (entry.isFile() && extname(entry.name) === '.js') { + files.push(fullPath); + } + } + + return files; +} + +function resolveImportPath(importPath, fromFile) { + const baseDir = dirname(fromFile); + const resolvedPath = resolve(baseDir, importPath); + + // Check if it's a file with .js extension + if (existsSync(`${resolvedPath}.js`)) { + return `${importPath}.js`; + } + + // Check if it's a directory with index.js + if (existsSync(resolvedPath) && existsSync(join(resolvedPath, 'index.js'))) { + return `${importPath}/index.js`; + } + + // Verify the file exists before adding extension + if (!existsSync(`${resolvedPath}.js`)) { + console.warn( + `Warning: Could not resolve import '${importPath}' from ${relative(buildDir, fromFile)}`, + ); + } + + // Default: assume it's a file and add .js + return `${importPath}.js`; +} + +function addExtensionsToImports(content, filePath) { + // Match relative imports: import ... from './path' or import ... from '../path' + // Also handle: import('./path') and require('./path') + const importRegex = + /(?:import\s+(?:(?:\{[^}]*\}|\*\s+as\s+\w+|\w+)(?:\s*,\s*(?:\{[^}]*\}|\*\s+as\s+\w+|\w+))*\s+from\s+)?|import\s*\(|require\s*\()['"](\.\.?\/[^'"]+)['"]/g; + + return content.replace(importRegex, (match, importPath) => { + // importPath is the second capture group (the path) + if (!importPath || typeof importPath !== 'string') { + return match; + } + + // Skip if already has an extension + if (/\.(js|mjs|ts|mts|json)$/.test(importPath)) { + return match; + } + + // Skip if ends with / (directory import that already has trailing slash) + if (importPath.endsWith('/')) { + return match; + } + + const newImportPath = resolveImportPath(importPath, filePath); + return match.replace(importPath, newImportPath); + }); +} + +async function processFile(filePath) { + const content = await readFile(filePath, 'utf-8'); + const newContent = addExtensionsToImports(content, filePath); + + if (content !== newContent) { + await writeFile(filePath, newContent, 'utf-8'); + const relativePath = relative(buildDir, filePath); + console.log(`Updated imports in ${relativePath}`); + } +} + +async function main() { + try { + const files = await getAllJsFiles(buildDir); + await Promise.all(files.map(processFile)); + console.log(`Processed ${files.length} files`); + } catch (error) { + console.error('Error processing files:', error); + process.exit(1); + } +} + +main(); diff --git a/packages/sync-server/loader.mjs b/packages/sync-server/loader.mjs new file mode 100644 index 0000000000..485024e9f6 --- /dev/null +++ b/packages/sync-server/loader.mjs @@ -0,0 +1,26 @@ +import { existsSync } from 'node:fs'; +import { resolve as nodeResolve, dirname, extname } from 'node:path'; +import { pathToFileURL } from 'node:url'; + +const extensions = ['.ts', '.js', '.mts', '.mjs']; + +export async function resolve(specifier, context, nextResolve) { + // Only handle relative imports without extensions + if (specifier.startsWith('.') && !extname(specifier)) { + const parentURL = context.parentURL; + if (parentURL) { + const parentPath = new URL(parentURL).pathname; + const parentDir = dirname(parentPath); + + // Try extensions in order + for (const ext of extensions) { + const resolvedPath = nodeResolve(parentDir, `${specifier}${ext}`); + if (existsSync(resolvedPath)) { + return nextResolve(pathToFileURL(resolvedPath).href, context); + } + } + } + } + + return nextResolve(specifier, context); +} diff --git a/packages/sync-server/migrations/1694360000000-create-folders.js b/packages/sync-server/migrations/1694360000000-create-folders.js index b86a7c89b2..d0892a272a 100644 --- a/packages/sync-server/migrations/1694360000000-create-folders.js +++ b/packages/sync-server/migrations/1694360000000-create-folders.js @@ -1,6 +1,6 @@ import fs from 'node:fs/promises'; -import { config } from '../src/load-config.js'; +import { config } from '../src/load-config'; async function ensureExists(path) { try { diff --git a/packages/sync-server/migrations/1694360479680-create-account-db.js b/packages/sync-server/migrations/1694360479680-create-account-db.js index 3c9647174b..56279c04ae 100644 --- a/packages/sync-server/migrations/1694360479680-create-account-db.js +++ b/packages/sync-server/migrations/1694360479680-create-account-db.js @@ -1,4 +1,4 @@ -import { getAccountDb } from '../src/account-db.js'; +import { getAccountDb } from '../src/account-db'; export const up = async function () { await getAccountDb().exec(` diff --git a/packages/sync-server/migrations/1694362247011-create-secret-table.js b/packages/sync-server/migrations/1694362247011-create-secret-table.js index 6a85c88150..ff1fa872eb 100644 --- a/packages/sync-server/migrations/1694362247011-create-secret-table.js +++ b/packages/sync-server/migrations/1694362247011-create-secret-table.js @@ -1,4 +1,4 @@ -import { getAccountDb } from '../src/account-db.js'; +import { getAccountDb } from '../src/account-db'; export const up = async function () { await getAccountDb().exec(` diff --git a/packages/sync-server/migrations/1702667624000-rename-nordigen-secrets.js b/packages/sync-server/migrations/1702667624000-rename-nordigen-secrets.js index 81b7a1e387..fb7987ae05 100644 --- a/packages/sync-server/migrations/1702667624000-rename-nordigen-secrets.js +++ b/packages/sync-server/migrations/1702667624000-rename-nordigen-secrets.js @@ -1,4 +1,4 @@ -import { getAccountDb } from '../src/account-db.js'; +import { getAccountDb } from '../src/account-db'; export const up = async function () { await getAccountDb().exec( diff --git a/packages/sync-server/migrations/1718889148000-openid.js b/packages/sync-server/migrations/1718889148000-openid.js index 607d638099..61c02f4b61 100644 --- a/packages/sync-server/migrations/1718889148000-openid.js +++ b/packages/sync-server/migrations/1718889148000-openid.js @@ -1,4 +1,4 @@ -import { getAccountDb } from '../src/account-db.js'; +import { getAccountDb } from '../src/account-db'; export const up = async function () { await getAccountDb().exec( diff --git a/packages/sync-server/migrations/1719409568000-multiuser.js b/packages/sync-server/migrations/1719409568000-multiuser.js index a5c83aa098..aac0c984f4 100644 --- a/packages/sync-server/migrations/1719409568000-multiuser.js +++ b/packages/sync-server/migrations/1719409568000-multiuser.js @@ -1,6 +1,6 @@ import { v4 as uuidv4 } from 'uuid'; -import { getAccountDb } from '../src/account-db.js'; +import { getAccountDb } from '../src/account-db'; export const up = async function () { const accountDb = getAccountDb(); diff --git a/packages/sync-server/package.json b/packages/sync-server/package.json index ac7739e979..e202ebe24a 100644 --- a/packages/sync-server/package.json +++ b/packages/sync-server/package.json @@ -14,10 +14,11 @@ ], "scripts": { "start": "yarn build && node build/app", - "start-monitor": "nodemon --exec 'tsc && node build/app' --ignore './build/**/*' --ext 'ts,js' build/app", - "build": "tsc && yarn copy-static-assets", + "start-monitor": "nodemon --exec 'yarn build && node build/app' --ignore './build/**/*' --ext 'ts,js' build/app", + "build": "tsc && yarn add-import-extensions && yarn copy-static-assets", + "add-import-extensions": "node bin/add-import-extensions.mjs", "copy-static-assets": "rm -rf build/src/sql && cp -r src/sql build/src/sql", - "test": "NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules --trace-warnings' vitest --run", + "test": "NODE_ENV=test NODE_OPTIONS='--experimental-vm-modules --import ./register-loader.mjs --trace-warnings' vitest --run", "db:migrate": "yarn build && cross-env NODE_ENV=development node build/src/scripts/run-migrations.js up", "db:downgrade": "yarn build && cross-env NODE_ENV=development node build/src/scripts/run-migrations.js down", "db:test-migrate": "yarn build && cross-env NODE_ENV=test node build/src/scripts/run-migrations.js up", diff --git a/packages/sync-server/register-loader.mjs b/packages/sync-server/register-loader.mjs new file mode 100644 index 0000000000..0302328ef9 --- /dev/null +++ b/packages/sync-server/register-loader.mjs @@ -0,0 +1,9 @@ +import { register } from 'node:module'; +import { dirname, resolve } from 'node:path'; +import { pathToFileURL, fileURLToPath } from 'node:url'; + +const __filename = fileURLToPath(import.meta.url); +const __dirname = dirname(__filename); +const loaderPath = resolve(__dirname, 'loader.mjs'); + +register(pathToFileURL(loaderPath).href, pathToFileURL(__dirname)); diff --git a/packages/sync-server/src/account-db.js b/packages/sync-server/src/account-db.js index 4c36287fb7..834085e477 100644 --- a/packages/sync-server/src/account-db.js +++ b/packages/sync-server/src/account-db.js @@ -2,10 +2,10 @@ import { join, resolve } from 'node:path'; import * as bcrypt from 'bcrypt'; -import { bootstrapOpenId } from './accounts/openid.js'; -import { bootstrapPassword, loginWithPassword } from './accounts/password.js'; -import { openDatabase } from './db.js'; -import { config } from './load-config.js'; +import { bootstrapOpenId } from './accounts/openid'; +import { bootstrapPassword, loginWithPassword } from './accounts/password'; +import { openDatabase } from './db'; +import { config } from './load-config'; let _accountDb; diff --git a/packages/sync-server/src/accounts/openid.js b/packages/sync-server/src/accounts/openid.js index ca1884c287..660cde31e0 100644 --- a/packages/sync-server/src/accounts/openid.js +++ b/packages/sync-server/src/accounts/openid.js @@ -5,15 +5,15 @@ import { clearExpiredSessions, getAccountDb, listLoginMethods, -} from '../account-db.js'; -import { config } from '../load-config.js'; +} from '../account-db'; +import { config } from '../load-config'; import { getUserByUsername, transferAllFilesFromUser, -} from '../services/user-service.js'; -import { TOKEN_EXPIRATION_NEVER } from '../util/validate-user.js'; +} from '../services/user-service'; +import { TOKEN_EXPIRATION_NEVER } from '../util/validate-user'; -import { checkPassword } from './password.js'; +import { checkPassword } from './password'; export async function bootstrapOpenId(configParameter) { if (!('issuer' in configParameter) && !('discoveryURL' in configParameter)) { diff --git a/packages/sync-server/src/accounts/password.js b/packages/sync-server/src/accounts/password.js index e9061dcb53..81407c52ee 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.js'; -import { config } from '../load-config.js'; -import { TOKEN_EXPIRATION_NEVER } from '../util/validate-user.js'; +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-account.js b/packages/sync-server/src/app-account.js index e1a9793de7..85d159289c 100644 --- a/packages/sync-server/src/app-account.js +++ b/packages/sync-server/src/app-account.js @@ -7,14 +7,11 @@ import { listLoginMethods, getUserInfo, getActiveLoginMethod, -} from './account-db.js'; -import { isValidRedirectUrl, loginWithOpenIdSetup } from './accounts/openid.js'; -import { changePassword, loginWithPassword } from './accounts/password.js'; -import { - errorMiddleware, - requestLoggerMiddleware, -} from './util/middlewares.js'; -import { validateAuthHeader, validateSession } from './util/validate-user.js'; +} from './account-db'; +import { isValidRedirectUrl, loginWithOpenIdSetup } from './accounts/openid'; +import { changePassword, loginWithPassword } from './accounts/password'; +import { errorMiddleware, requestLoggerMiddleware } from './util/middlewares'; +import { validateAuthHeader, validateSession } from './util/validate-user'; const app = express(); app.use(express.json()); diff --git a/packages/sync-server/src/app-admin.js b/packages/sync-server/src/app-admin.js index 14619ed1cd..e45ac0866e 100644 --- a/packages/sync-server/src/app-admin.js +++ b/packages/sync-server/src/app-admin.js @@ -1,14 +1,14 @@ import express from 'express'; import { v4 as uuidv4 } from 'uuid'; -import { isAdmin } from './account-db.js'; -import * as UserService from './services/user-service.js'; +import { isAdmin } from './account-db'; +import * as UserService from './services/user-service'; import { errorMiddleware, requestLoggerMiddleware, validateSessionMiddleware, -} from './util/middlewares.js'; -import { validateSession } from './util/validate-user.js'; +} from './util/middlewares'; +import { validateSession } from './util/validate-user'; const app = express(); app.use(express.json()); diff --git a/packages/sync-server/src/app-admin.test.js b/packages/sync-server/src/app-admin.test.js index 796945495c..79cd8d3be4 100644 --- a/packages/sync-server/src/app-admin.test.js +++ b/packages/sync-server/src/app-admin.test.js @@ -1,8 +1,8 @@ import request from 'supertest'; import { v4 as uuidv4 } from 'uuid'; -import { getAccountDb } from './account-db.js'; -import { handlers as app } from './app-admin.js'; +import { getAccountDb } from './account-db'; +import { handlers as app } from './app-admin'; const ADMIN_ROLE = 'ADMIN'; const BASIC_ROLE = 'BASIC'; diff --git a/packages/sync-server/src/app-cors-proxy.js b/packages/sync-server/src/app-cors-proxy.js index bc2afb78bc..c5f45c3666 100644 --- a/packages/sync-server/src/app-cors-proxy.js +++ b/packages/sync-server/src/app-cors-proxy.js @@ -2,9 +2,9 @@ import express from 'express'; import rateLimit from 'express-rate-limit'; import ipaddr from 'ipaddr.js'; -import { config } from './load-config.js'; -import { requestLoggerMiddleware } from './util/middlewares.js'; -import { validateSession } from './util/validate-user.js'; +import { config } from './load-config'; +import { requestLoggerMiddleware } from './util/middlewares'; +import { validateSession } from './util/validate-user'; const app = express(); diff --git a/packages/sync-server/src/app-cors-proxy.test.js b/packages/sync-server/src/app-cors-proxy.test.js index a46b0fd703..58ad75e6b2 100644 --- a/packages/sync-server/src/app-cors-proxy.test.js +++ b/packages/sync-server/src/app-cors-proxy.test.js @@ -2,21 +2,21 @@ import ipaddr from 'ipaddr.js'; import request from 'supertest'; import { vi, describe, it, expect, beforeEach, beforeAll } from 'vitest'; -import { handlers as app, clearAllowlistCache } from './app-cors-proxy.js'; -import { config } from './load-config.js'; -import { validateSession } from './util/validate-user.js'; +import { handlers as app, clearAllowlistCache } from './app-cors-proxy'; +import { config } from './load-config'; +import { validateSession } from './util/validate-user'; -vi.mock('./load-config.js', () => ({ +vi.mock('./load-config', () => ({ config: { get: vi.fn(), }, })); -vi.mock('./util/middlewares.js', () => ({ +vi.mock('./util/middlewares', () => ({ requestLoggerMiddleware: (req, res, next) => next(), })); -vi.mock('./util/validate-user.js', () => ({ +vi.mock('./util/validate-user', () => ({ validateSession: vi.fn(), })); diff --git a/packages/sync-server/src/app-gocardless/README.md b/packages/sync-server/src/app-gocardless/README.md index 5632d1b7ac..39ced9ed5b 100644 --- a/packages/sync-server/src/app-gocardless/README.md +++ b/packages/sync-server/src/app-gocardless/README.md @@ -174,7 +174,7 @@ Please follow the following patterns when implementing a custom normalizeTransac E.g. ```js -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; export default { ... diff --git a/packages/sync-server/src/app-gocardless/app-gocardless.js b/packages/sync-server/src/app-gocardless/app-gocardless.js index e143b89faa..cab1faa2e3 100644 --- a/packages/sync-server/src/app-gocardless/app-gocardless.js +++ b/packages/sync-server/src/app-gocardless/app-gocardless.js @@ -3,20 +3,20 @@ import path from 'path'; import { isAxiosError } from 'axios'; import express from 'express'; -import { sha256String } from '../util/hash.js'; +import { sha256String } from '../util/hash'; import { requestLoggerMiddleware, validateSessionMiddleware, -} from '../util/middlewares.js'; +} from '../util/middlewares'; import { AccountNotLinkedToRequisition, GenericGoCardlessError, RateLimitError, RequisitionNotLinked, -} from './errors.js'; -import { goCardlessService } from './services/gocardless-service.js'; -import { handleError } from './util/handle-error.js'; +} from './errors'; +import { goCardlessService } from './services/gocardless-service'; +import { handleError } from './util/handle-error'; const app = express(); app.use(requestLoggerMiddleware); diff --git a/packages/sync-server/src/app-gocardless/bank-factory.js b/packages/sync-server/src/app-gocardless/bank-factory.js index 7bb5b06e99..624bcc4d09 100644 --- a/packages/sync-server/src/app-gocardless/bank-factory.js +++ b/packages/sync-server/src/app-gocardless/bank-factory.js @@ -2,7 +2,7 @@ import fs from 'node:fs'; import path from 'node:path'; import { fileURLToPath, pathToFileURL } from 'node:url'; -import IntegrationBank from './banks/integration-bank.js'; +import IntegrationBank from './banks/integration-bank'; const dirname = path.resolve(fileURLToPath(import.meta.url), '..'); const banksDir = path.resolve(dirname, 'banks'); diff --git a/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js b/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js index a564be9bf9..599a147e9f 100644 --- a/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js +++ b/packages/sync-server/src/app-gocardless/banks/abanca_caglesmm.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js b/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js index 8999b57346..3da4707ae7 100644 --- a/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js +++ b/packages/sync-server/src/app-gocardless/banks/abnamro_abnanl2a.js @@ -1,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, 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.js index e10e5e8c6a..4bb2d5d50f 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,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js b/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js index ecf6e2bba5..4313a04120 100644 --- a/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js +++ b/packages/sync-server/src/app-gocardless/banks/bancsabadell_bsabesbbb.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/bank.interface.ts b/packages/sync-server/src/app-gocardless/banks/bank.interface.ts index e0dfc47e72..5049bd9831 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,8 @@ -import { Transaction, Balance } from '../gocardless-node.types.js'; +import { Transaction, Balance } from '../gocardless-node.types'; import { DetailedAccountWithInstitution, NormalizedAccountDetails, -} from '../gocardless.types.js'; +} from '../gocardless.types'; type TransactionExtended = Transaction & { date?: string; diff --git a/packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.js b/packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.js index 0225bbbb9b..ab1e1da452 100644 --- a/packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.js +++ b/packages/sync-server/src/app-gocardless/banks/bank_of_ireland_b365_bofiie2d.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js b/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js index fd824e1dd3..1b3bac7d6e 100644 --- a/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js +++ b/packages/sync-server/src/app-gocardless/banks/bankinter_bkbkesmm.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js b/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js index 5b7ede23c1..6c88fccce6 100644 --- a/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js +++ b/packages/sync-server/src/app-gocardless/banks/belfius_gkccbebb.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, 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.js index 619b76f3c6..8a6f0d9c02 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,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js b/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js index 28f4be55ab..86220d480d 100644 --- a/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js +++ b/packages/sync-server/src/app-gocardless/banks/bnp_be_gebabebb.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js b/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js index 45cef56832..c9da3de4dd 100644 --- a/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js +++ b/packages/sync-server/src/app-gocardless/banks/boursobank_bousfrppxxx.js @@ -1,6 +1,6 @@ -import { title } from '../../util/title/index.js'; +import { title } from '../../util/title/index'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; const regexCard = /^CARTE (?\d{2}\/\d{2}\/\d{2}) (?.+?)( \d+)?( CB\*\d{4})?$/; @@ -13,7 +13,7 @@ const regexLoan = /^ECH PRET:/; const regexCreditNote = /^AVOIR (?\d{2}\/\d{2}\/\d{2}) (?.+?) CB\*\d{4,}/; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.js b/packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.js index 3d94493dcb..62fd9b0a3d 100644 --- a/packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.js +++ b/packages/sync-server/src/app-gocardless/banks/bper_retail_bpmoit22.js @@ -3,7 +3,7 @@ * while keeping the raw description in the notes field. */ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; const CARD_PAYMENT_PREFIX = 'PAGAMENTO SU CIRCUITO INTERNAZIONALE'; const CARD_PAYMENT_SUFFIX = 'Operazione carta'; @@ -54,7 +54,7 @@ function setPayee(editedTransaction, payee) { editedTransaction.debtorName = payee; } -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ const BperRetailBank = { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js b/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js index 013fe7f2dd..d7422dedbc 100644 --- a/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js +++ b/packages/sync-server/src/app-gocardless/banks/cbc_cregbebb.js @@ -1,7 +1,7 @@ -import Fallback from './integration-bank.js'; -import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo.js'; +import Fallback from './integration-bank'; +import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.js b/packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.js index c982989c3c..7ddeb24d7c 100644 --- a/packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.js +++ b/packages/sync-server/src/app-gocardless/banks/cetelem_cetmptp1xxx.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js b/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js index 6fe0e66554..c776f60ceb 100644 --- a/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js +++ b/packages/sync-server/src/app-gocardless/banks/commerzbank_cobadeff.js @@ -1,7 +1,7 @@ -import Fallback from './integration-bank.js'; -import { escapeRegExp } from './util/escape-regexp.js'; +import Fallback from './integration-bank'; +import { escapeRegExp } from './util/escape-regexp'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/danskebank_privat.js b/packages/sync-server/src/app-gocardless/banks/danskebank_privat.js index 5744e91710..76a12176bc 100644 --- a/packages/sync-server/src/app-gocardless/banks/danskebank_privat.js +++ b/packages/sync-server/src/app-gocardless/banks/danskebank_privat.js @@ -1,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.js b/packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.js index 4d753e0326..fc863496b9 100644 --- a/packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.js +++ b/packages/sync-server/src/app-gocardless/banks/direkt_heladef1822.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js b/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js index 24c981ae09..8bba4fce18 100644 --- a/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js +++ b/packages/sync-server/src/app-gocardless/banks/easybank_bawaatww.js @@ -1,9 +1,9 @@ -import { formatPayeeName } from '../../util/payee-name.js'; -import { title } from '../../util/title/index.js'; +import { formatPayeeName } from '../../util/payee-name'; +import { title } from '../../util/title/index'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, @@ -32,7 +32,7 @@ export default { /** * Extracts the payee name from the remittanceInformationStructured - * @param {import('../gocardless-node.types.js').Transaction} transaction + * @param {import('../gocardless-node.types').Transaction} transaction */ function extractPayeeName(transaction) { const structured = transaction.remittanceInformationStructured; diff --git a/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js b/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js index ce7ddf1422..1ad05a2817 100644 --- a/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js +++ b/packages/sync-server/src/app-gocardless/banks/entercard_swednokk.js @@ -1,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js b/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js index dadae97515..b0e3f038f5 100644 --- a/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js +++ b/packages/sync-server/src/app-gocardless/banks/fortuneo_ftnofrp1xxx.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js b/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js index deef001967..89e4e52ba8 100644 --- a/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js +++ b/packages/sync-server/src/app-gocardless/banks/hype_hyeeit22.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.js b/packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.js index 4305502b6e..36c59209d2 100644 --- a/packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.js +++ b/packages/sync-server/src/app-gocardless/banks/ing_ingbrobu.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js b/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js index bb77aa0d85..9871566ddf 100644 --- a/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js +++ b/packages/sync-server/src/app-gocardless/banks/ing_ingddeff.js @@ -1,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, 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.js index 2f7e69aa10..6a4f01aa44 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,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/integration-bank.js b/packages/sync-server/src/app-gocardless/banks/integration-bank.js index 3aaf1d6ace..9f97cea192 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.js'; +import { formatPayeeName } from '../../util/payee-name'; import { amountToInteger, printIban, sortByBookingDateOrValueDate, -} from '../utils.js'; +} from '../utils'; const SORTED_BALANCE_TYPE_LIST = [ 'closingBooked', @@ -17,7 +17,7 @@ const SORTED_BALANCE_TYPE_LIST = [ 'openingBooked', ]; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { institutionIds: ['IntegrationBank'], diff --git a/packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.js b/packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.js index a927412fac..f1b20962db 100644 --- a/packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.js +++ b/packages/sync-server/src/app-gocardless/banks/isybank_itbbitmm.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js b/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js index db574db85c..793320febf 100644 --- a/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js +++ b/packages/sync-server/src/app-gocardless/banks/kbc_kredbebb.js @@ -1,7 +1,7 @@ -import Fallback from './integration-bank.js'; -import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo.js'; +import Fallback from './integration-bank'; +import { extractPayeeNameFromRemittanceInfo } from './util/extract-payeeName-from-remittanceInfo'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/lhv-lhvbee22.js b/packages/sync-server/src/app-gocardless/banks/lhv-lhvbee22.js index b598c159d0..2eb117ca79 100644 --- a/packages/sync-server/src/app-gocardless/banks/lhv-lhvbee22.js +++ b/packages/sync-server/src/app-gocardless/banks/lhv-lhvbee22.js @@ -1,8 +1,8 @@ import * as d from 'date-fns'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, 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.js index 4f24c399e4..9bf0282d76 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,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.js b/packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.js index 22efe83a5e..2ccf1ea313 100644 --- a/packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.js +++ b/packages/sync-server/src/app-gocardless/banks/nationwide_naiagb21.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js b/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js index 60361ebb40..e4d831087d 100644 --- a/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js +++ b/packages/sync-server/src/app-gocardless/banks/nbg_ethngraaxxx.js @@ -1,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, 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.js index 3846dd7cbd..0c30aa091f 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,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, 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.js index fab38a36f3..21d645a626 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,9 +1,9 @@ -import { formatPayeeName } from '../../util/payee-name.js'; -import { title } from '../../util/title/index.js'; +import { formatPayeeName } from '../../util/payee-name'; +import { title } from '../../util/title/index'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, @@ -31,7 +31,7 @@ export default { /** * Extracts the payee name from the remittanceInformationStructured - * @param {import('../gocardless-node.types.js').Transaction} transaction + * @param {import('../gocardless-node.types').Transaction} transaction */ function extractPayeeName(transaction) { const structured = transaction.remittanceInformationStructured; diff --git a/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js b/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js index b5fb432162..7807bea52d 100644 --- a/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js +++ b/packages/sync-server/src/app-gocardless/banks/revolut_revolt21.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js b/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js index f63a3c9c8d..8e0db8422a 100644 --- a/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js +++ b/packages/sync-server/src/app-gocardless/banks/sandboxfinance_sfin0000.js @@ -1,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, 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.js index de4bbcb4f7..012bbb2f00 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,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/seb_privat.js b/packages/sync-server/src/app-gocardless/banks/seb_privat.js index c7725319cf..b4fd4e554d 100644 --- a/packages/sync-server/src/app-gocardless/banks/seb_privat.js +++ b/packages/sync-server/src/app-gocardless/banks/seb_privat.js @@ -1,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js b/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js index 9f5dec860c..6a82053864 100644 --- a/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js +++ b/packages/sync-server/src/app-gocardless/banks/sparnord_spnodk22.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, 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.js index 59dda43cbe..b0166397de 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,8 +1,8 @@ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js b/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js index e5c5079830..b1343537f6 100644 --- a/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js +++ b/packages/sync-server/src/app-gocardless/banks/spk_marburg_biedenkopf_heladef1mar.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js b/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js index 06aaea5f00..fdc3e5dfb8 100644 --- a/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js +++ b/packages/sync-server/src/app-gocardless/banks/spk_worms_alzey_ried_malade51wor.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js b/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js index d1e8ecc5ab..7457aa0c51 100644 --- a/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js +++ b/packages/sync-server/src/app-gocardless/banks/ssk_dusseldorf_dussdeddxxx.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/banks/ssk_munchen.js b/packages/sync-server/src/app-gocardless/banks/ssk_munchen.js index 7c745988a5..75fe359b5b 100644 --- a/packages/sync-server/src/app-gocardless/banks/ssk_munchen.js +++ b/packages/sync-server/src/app-gocardless/banks/ssk_munchen.js @@ -1,10 +1,10 @@ /** * Credit for this code goes to Nebukadneza at https://github.com/Nebukadneza */ -import { amountToInteger } from '../utils.js'; +import { amountToInteger } from '../utils'; -import Fallback from './integration-bank.js'; -/** @type {import('./bank.interface.js').IBank} */ +import Fallback from './integration-bank'; +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, institutionIds: ['SSK_MUNCHEN_SSKMDEMMXXX'], diff --git a/packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.js b/packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.js index 77199838f4..bb165ede43 100644 --- a/packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.js +++ b/packages/sync-server/src/app-gocardless/banks/swedbank_habalv22.js @@ -1,8 +1,8 @@ import * as d from 'date-fns'; -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, 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.js index 54af0cc421..85a9b87405 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.js'; -import Abanca from '../abanca_caglesmm.js'; +import { mockTransactionAmount } from '../../services/tests/fixtures'; +import Abanca from '../abanca_caglesmm'; 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.js index fd9b35c5a5..2ee46083ef 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.js'; +import AbnamroAbnanl2a from '../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.js index 9cf1949d12..8a1ee569d7 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.js'; +import Sabadell from '../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.js index 9a61253fd7..034135a603 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.js'; -import Belfius from '../belfius_gkccbebb.js'; +import { mockTransactionAmount } from '../../services/tests/fixtures'; +import Belfius from '../belfius_gkccbebb'; 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.js index 0340f130b5..88ae644534 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.js'; +import BoursoBank from '../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.js index 21e7a2c8fd..c5b10a263e 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.js'; +import BperRetail from '../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.js index 21d248a85d..452dca1c99 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.js'; +import CBCcregbebb from '../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.js index 0485d4017d..4bd3451f99 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.js'; +import CommerzbankCobadeff from '../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.js index 31bb708fb0..9d7daa22b7 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.js'; -import EasybankBawaatww from '../easybank_bawaatww.js'; +import { mockTransactionAmount } from '../../services/tests/fixtures'; +import EasybankBawaatww from '../easybank_bawaatww'; 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.js index a19dd3b560..979c2740ce 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.js'; +import Fortuneo from '../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.js index de8fbd22c9..eb0c394f9d 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,8 +1,8 @@ -import IngIngddeff from '../ing_ingddeff.js'; +import IngIngddeff from '../ing_ingddeff'; describe('IngIngddeff', () => { describe('#normalizeAccount', () => { - /** @type {import('../../gocardless.types.js').DetailedAccountWithInstitution} */ + /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */ const accountRaw = { resourceId: 'e896eec6-6096-4efc-a941-756bd9d74765', iban: 'DE02500105170137075030', @@ -266,7 +266,7 @@ describe('IngIngddeff', () => { }); describe('#countStartingBalance', () => { - /** @type {import('../../gocardless-node.types.js').Balance[]} */ + /** @type {import('../../gocardless-node.types').Balance[]} */ const balances = [ { balanceAmount: { amount: '3596.87', currency: 'EUR' }, 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.js index 72665cc535..470e30994b 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,9 +1,9 @@ -import { mockTransactionAmount } from '../../services/tests/fixtures.js'; -import IngPlIngbplpw from '../ing_pl_ingbplpw.js'; +import { mockTransactionAmount } from '../../services/tests/fixtures'; +import IngPlIngbplpw from '../ing_pl_ingbplpw'; describe('IngPlIngbplpw', () => { describe('#normalizeAccount', () => { - /** @type {import('../../gocardless.types.js').DetailedAccountWithInstitution} */ + /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */ const accountRaw = { resourceId: 'PL00000000000000000987654321', iban: 'PL00000000000000000987654321', @@ -139,7 +139,7 @@ describe('IngPlIngbplpw', () => { describe('#countStartingBalance', () => { it('should calculate the starting balance correctly', () => { - /** @type {import('../../gocardless-node.types.js').Transaction[]} */ + /** @type {import('../../gocardless-node.types').Transaction[]} */ const sortedTransactions = [ { transactionAmount: { amount: '-100.00', currency: 'USD' }, @@ -164,7 +164,7 @@ describe('IngPlIngbplpw', () => { }, ]; - /** @type {import('../../gocardless-node.types.js').Balance[]} */ + /** @type {import('../../gocardless-node.types').Balance[]} */ const balances = [ { balanceType: 'interimBooked', @@ -187,7 +187,7 @@ describe('IngPlIngbplpw', () => { it('returns the same balance amount when no transactions', () => { const transactions = []; - /** @type {import('../../gocardless-node.types.js').Balance[]} */ + /** @type {import('../../gocardless-node.types').Balance[]} */ const balances = [ { balanceType: 'interimBooked', 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.js index 2c2057f26a..480fd6210e 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 { mockExtendAccountsAboutInstitutions, mockInstitution, -} from '../../services/tests/fixtures.js'; -import IntegrationBank from '../integration-bank.js'; +} from '../../services/tests/fixtures'; +import IntegrationBank from '../integration-bank'; describe('IntegrationBank', () => { describe('normalizeAccount', () => { @@ -80,7 +80,7 @@ describe('IntegrationBank', () => { }); describe('calculateStartingBalance', () => { - /** @type {import('../../gocardless-node.types.js').Transaction[]} */ + /** @type {import('../../gocardless-node.types').Transaction[]} */ const transactions = [ { bookingDate: '2022-01-01', @@ -96,7 +96,7 @@ describe('IntegrationBank', () => { }, ]; - /** @type {import('../../gocardless-node.types.js').Balance[]} */ + /** @type {import('../../gocardless-node.types').Balance[]} */ const balances = [ { balanceAmount: { amount: '1000.00', currency: 'EUR' }, 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.js index e3326a12af..de39f456ac 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.js'; +import KBCkredbebb from '../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.js index 0f40c49d74..856d830809 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.js'; +import LhvLhvbee22 from '../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.js index b99eb1b690..e9f9f70c02 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,8 +1,8 @@ -import MbankRetailBrexplpw from '../mbank_retail_brexplpw.js'; +import MbankRetailBrexplpw from '../mbank_retail_brexplpw'; describe('MbankRetailBrexplpw', () => { describe('#normalizeAccount', () => { - /** @type {import('../../gocardless.types.js').DetailedAccountWithInstitution} */ + /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */ const accountRaw = { iban: 'PL00000000000000000987654321', currency: 'PLN', @@ -137,7 +137,7 @@ describe('MbankRetailBrexplpw', () => { }); describe('#countStartingBalance', () => { - /** @type {import('../../gocardless-node.types.js').Balance[]} */ + /** @type {import('../../gocardless-node.types').Balance[]} */ const balances = [ { balanceAmount: { amount: '1000.00', currency: 'PLN' }, 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.js index b52ee0429b..4ba0a236d5 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.js'; -import Nationwide from '../nationwide_naiagb21.js'; +import { mockTransactionAmount } from '../../services/tests/fixtures'; +import Nationwide from '../nationwide_naiagb21'; 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.js index 990c6cd5e2..2a3cfaaaea 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.js'; +import NbgEthngraaxxx from '../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.js index 613b1132ef..19ea8c9ca9 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.js'; -import RaiffeisenAtRzbaatww from '../raiffeisen_at_rzbaatww.js'; +import { mockTransactionAmount } from '../../services/tests/fixtures'; +import RaiffeisenAtRzbaatww from '../raiffeisen_at_rzbaatww'; 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.js index c48e3447b9..afcbe4faeb 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.js'; +import RevolutRevolt21 from '../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.js index af3612c0cc..b70ea35f4f 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,8 +1,8 @@ -import SandboxfinanceSfin0000 from '../sandboxfinance_sfin0000.js'; +import SandboxfinanceSfin0000 from '../sandboxfinance_sfin0000'; describe('SandboxfinanceSfin0000', () => { describe('#normalizeAccount', () => { - /** @type {import('../../gocardless.types.js').DetailedAccountWithInstitution} */ + /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */ const accountRaw = { resourceId: '01F3NS5ASCNMVCTEJDT0G215YE', iban: 'GL0865354374424724', @@ -74,7 +74,7 @@ describe('SandboxfinanceSfin0000', () => { }); describe('#countStartingBalance', () => { - /** @type {import('../../gocardless-node.types.js').Balance[]} */ + /** @type {import('../../gocardless-node.types').Balance[]} */ const balances = [ { balanceAmount: { amount: '1000.00', currency: 'PLN' }, @@ -115,7 +115,7 @@ describe('SandboxfinanceSfin0000', () => { }); it('returns the balance minus the available transactions', () => { - /** @type {import('../../gocardless-node.types.js').Transaction[]} */ + /** @type {import('../../gocardless-node.types').Transaction[]} */ const transactions = [ { transactionAmount: { amount: '200.00', currency: 'PLN' }, 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.js index abd244dce3..695710eab8 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,8 +1,8 @@ -import SpkMarburgBiedenkopfHeladef1mar from '../spk_marburg_biedenkopf_heladef1mar.js'; +import SpkMarburgBiedenkopfHeladef1mar from '../spk_marburg_biedenkopf_heladef1mar'; describe('SpkMarburgBiedenkopfHeladef1mar', () => { describe('#normalizeAccount', () => { - /** @type {import('../../gocardless.types.js').DetailedAccountWithInstitution} */ + /** @type {import('../../gocardless.types').DetailedAccountWithInstitution} */ const accountRaw = { resourceId: 'e896eec6-6096-4efc-a941-756bd9d74765', iban: 'DE50533500000123456789', @@ -210,7 +210,7 @@ describe('SpkMarburgBiedenkopfHeladef1mar', () => { }); describe('#countStartingBalance', () => { - /** @type {import('../../gocardless-node.types.js').Balance[]} */ + /** @type {import('../../gocardless-node.types').Balance[]} */ const balances = [ { balanceAmount: { amount: '3596.87', currency: 'EUR' }, 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.js index 9ed699f416..f9106edf8e 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.js'; +import SskDusseldorfDussdeddxxx from '../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.js index 7fa3c0ad79..38a0d5355f 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.js'; +import SwedbankHabaLV22 from '../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.js index 902a221564..b246ad5194 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.js'; -import Virgin from '../virgin_nrnbgb22.js'; +import { mockTransactionAmount } from '../../services/tests/fixtures'; +import Virgin from '../virgin_nrnbgb22'; describe('Virgin', () => { describe('#normalizeTransaction', () => { diff --git a/packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.js b/packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.js index 7529c6d4cf..2b1d586540 100644 --- a/packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.js +++ b/packages/sync-server/src/app-gocardless/banks/virgin_nrnbgb22.js @@ -1,6 +1,6 @@ -import Fallback from './integration-bank.js'; +import Fallback from './integration-bank'; -/** @type {import('./bank.interface.js').IBank} */ +/** @type {import('./bank.interface').IBank} */ export default { ...Fallback, diff --git a/packages/sync-server/src/app-gocardless/gocardless.types.ts b/packages/sync-server/src/app-gocardless/gocardless.types.ts index 373749d915..d9c032a518 100644 --- a/packages/sync-server/src/app-gocardless/gocardless.types.ts +++ b/packages/sync-server/src/app-gocardless/gocardless.types.ts @@ -5,7 +5,7 @@ import { Transactions, Balance, Transaction, -} from './gocardless-node.types.js'; +} from './gocardless-node.types'; export type DetailedAccount = Omit & GoCardlessAccountMetadata; diff --git a/packages/sync-server/src/app-gocardless/services/gocardless-service.js b/packages/sync-server/src/app-gocardless/services/gocardless-service.js index f2c41b8526..1dce95f0ae 100644 --- a/packages/sync-server/src/app-gocardless/services/gocardless-service.js +++ b/packages/sync-server/src/app-gocardless/services/gocardless-service.js @@ -2,8 +2,8 @@ import jwt from 'jws'; import * as nordigenNode from 'nordigen-node'; import { v4 as uuidv4 } from 'uuid'; -import { SecretName, secretsService } from '../../services/secrets-service.js'; -import { BankFactory, isSpecialContinuousAccessBank } from '../bank-factory.js'; +import { SecretName, secretsService } from '../../services/secrets-service'; +import { BankFactory, isSpecialContinuousAccessBank } from '../bank-factory'; import { AccessDeniedError, AccountNotLinkedToRequisition, @@ -16,7 +16,7 @@ import { RequisitionNotLinked, ServiceError, UnknownError, -} from '../errors.js'; +} from '../errors'; const GoCardlessClient = nordigenNode.default; @@ -111,7 +111,7 @@ export const goCardlessService = { * @throws {RateLimitError} * @throws {UnknownError} * @throws {ServiceError} - * @returns {Promise} + * @returns {Promise} */ getLinkedRequisition: async requisitionId => { const requisition = await goCardlessService.getRequisition(requisitionId); @@ -140,7 +140,7 @@ export const goCardlessService = { * @throws {RateLimitError} * @throws {UnknownError} * @throws {ServiceError} - * @returns {Promise<{requisition: import('../gocardless-node.types.js').Requisition, accounts: Array}>} + * @returns {Promise<{requisition: import('../gocardless-node.types').Requisition, accounts: Array}>} */ getRequisitionWithAccounts: async requisitionId => { const requisition = @@ -191,7 +191,7 @@ export const goCardlessService = { * @throws {RateLimitError} * @throws {UnknownError} * @throws {ServiceError} - * @returns {Promise<{balances: Array, institutionId: string, transactions: {booked: Array, pending: Array, all: Array}, startingBalance: number}>} + * @returns {Promise<{balances: Array, institutionId: string, transactions: {booked: Array, pending: Array, all: Array}, startingBalance: number}>} */ getTransactionsWithBalance: async ( requisitionId, @@ -249,7 +249,7 @@ export const goCardlessService = { * @throws {RateLimitError} * @throws {UnknownError} * @throws {ServiceError} - * @returns {Promise<{institutionId: string, transactions: {booked: Array, pending: Array, all: Array}}>} + * @returns {Promise<{institutionId: string, transactions: {booked: Array, pending: Array, all: Array}}>} */ getNormalizedTransactions: async ( requisitionId, @@ -298,7 +298,7 @@ export const goCardlessService = { /** * - * @param {import('../gocardless.types.js').CreateRequisitionParams} params + * @param {import('../gocardless.types').CreateRequisitionParams} params * @throws {InvalidInputDataError} * @throws {InvalidGoCardlessTokenError} * @throws {AccessDeniedError} @@ -397,7 +397,7 @@ export const goCardlessService = { * @throws {RateLimitError} * @throws {UnknownError} * @throws {ServiceError} - * @returns { Promise } + * @returns { Promise } */ getRequisition: async requisitionId => { await goCardlessService.setToken(); @@ -415,7 +415,7 @@ export const goCardlessService = { /** * Retrieve an detailed account by account id * @param accountId - * @returns {Promise} + * @returns {Promise} */ getDetailedAccount: async accountId => { let detailedAccount, metadataAccount; @@ -454,7 +454,7 @@ export const goCardlessService = { * Unlike getDetailedAccount, this method is not affected by institution rate-limits. * * @param accountId - * @returns {Promise} + * @returns {Promise} */ getAccountMetadata: async accountId => { let response; @@ -478,7 +478,7 @@ export const goCardlessService = { * @throws {RateLimitError} * @throws {UnknownError} * @throws {ServiceError} - * @returns {Promise>} + * @returns {Promise>} */ getInstitutions: async country => { let response; @@ -502,7 +502,7 @@ export const goCardlessService = { * @throws {RateLimitError} * @throws {UnknownError} * @throws {ServiceError} - * @returns {Promise} + * @returns {Promise} */ getInstitution: async institutionId => { let response; @@ -517,8 +517,8 @@ export const goCardlessService = { /** * Extends provided accounts about details of their institution - * @param {{accounts: Array, institutions: Array}} params - * @returns {Promise>} + * @param {{accounts: Array, institutions: Array}} params + * @returns {Promise>} */ extendAccountsAboutInstitutions: async ({ accounts, institutions }) => { const institutionsById = institutions.reduce((acc, institution) => { @@ -537,7 +537,7 @@ export const goCardlessService = { /** * Returns account transaction in provided dates - * @param {import('../gocardless.types.js').GetTransactionsParams} params + * @param {import('../gocardless.types').GetTransactionsParams} params * @throws {InvalidInputDataError} * @throws {InvalidGoCardlessTokenError} * @throws {AccessDeniedError} @@ -546,7 +546,7 @@ export const goCardlessService = { * @throws {RateLimitError} * @throws {UnknownError} * @throws {ServiceError} - * @returns {Promise} + * @returns {Promise} */ getTransactions: async ({ institutionId, accountId, startDate, endDate }) => { let response; @@ -582,7 +582,7 @@ export const goCardlessService = { * @throws {RateLimitError} * @throws {UnknownError} * @throws {ServiceError} - * @returns {Promise} + * @returns {Promise} */ getBalances: async accountId => { let response; diff --git a/packages/sync-server/src/app-gocardless/services/tests/fixtures.js b/packages/sync-server/src/app-gocardless/services/tests/fixtures.js index aecf48b695..369f01f3d3 100644 --- a/packages/sync-server/src/app-gocardless/services/tests/fixtures.js +++ b/packages/sync-server/src/app-gocardless/services/tests/fixtures.js @@ -1,4 +1,4 @@ -/** @type {{balances: import('../../gocardless-node.types.js').Balance[]}} */ +/** @type {{balances: import('../../gocardless-node.types').Balance[]}} */ export const mockedBalances = { balances: [ { @@ -20,7 +20,7 @@ export const mockedBalances = { ], }; -/** @type {{transactions: import('../../gocardless-node.types.js').Transactions}} */ +/** @type {{transactions: import('../../gocardless-node.types').Transactions}} */ export const mockTransactions = { transactions: { booked: [ @@ -68,7 +68,7 @@ export const mockUnknownError = { status_code: 500, }; -/** @type {{account: import('../../gocardless-node.types.js').GoCardlessAccountDetails}} */ +/** @type {{account: import('../../gocardless-node.types').GoCardlessAccountDetails}} */ export const mockAccountDetails = { account: { resourceId: 'PL00000000000000000987654321', @@ -81,7 +81,7 @@ export const mockAccountDetails = { }, }; -/** @type {import('../../gocardless-node.types.js').GoCardlessAccountMetadata} */ +/** @type {import('../../gocardless-node.types').GoCardlessAccountMetadata} */ export const mockAccountMetaData = { id: 'f0e49aa6-f6db-48fc-94ca-4a62372fadf4', created: '2022-07-24T20:45:47.847062Z', @@ -92,13 +92,13 @@ export const mockAccountMetaData = { owner_name: 'JOHN EXAMPLE', }; -/** @type {import('../../gocardless.types.js').DetailedAccount} */ +/** @type {import('../../gocardless.types').DetailedAccount} */ export const mockDetailedAccount = { ...mockAccountDetails.account, ...mockAccountMetaData, }; -/** @type {import('../../gocardless-node.types.js').Institution} */ +/** @type {import('../../gocardless-node.types').Institution} */ export const mockInstitution = { id: 'N26_NTSBDEB1', name: 'N26 Bank', @@ -109,7 +109,7 @@ export const mockInstitution = { logo: 'https://cdn.nordigen.com/ais/N26_SANDBOX_NTSBDEB1.png', }; -/** @type {import('../../gocardless-node.types.js').Requisition} */ +/** @type {import('../../gocardless-node.types').Requisition} */ export const mockRequisition = { id: '3fa85f64-5717-4562-b3fc-2c963f66afa6', created: '2023-01-31T18:15:50.172Z', @@ -148,19 +148,19 @@ export const mockCreateRequisition = { redirect_immediate: false, }; -/** @type {import('../../gocardless.types.js').DetailedAccount} */ +/** @type {import('../../gocardless.types').DetailedAccount} */ export const mockDetailedAccountExample1 = { ...mockDetailedAccount, name: 'account-example-one', }; -/** @type {import('../../gocardless.types.js').DetailedAccount} */ +/** @type {import('../../gocardless.types').DetailedAccount} */ export const mockDetailedAccountExample2 = { ...mockDetailedAccount, name: 'account-example-two', }; -/** @type {import('../../gocardless.types.js').DetailedAccountWithInstitution[]} */ +/** @type {import('../../gocardless.types').DetailedAccountWithInstitution[]} */ export const mockExtendAccountsAboutInstitutions = [ { ...mockDetailedAccountExample1, 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.js index 5f75812331..9d77460b8f 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,12 +10,12 @@ import { RequisitionNotLinked, ServiceError, UnknownError, -} from '../../errors.js'; +} from '../../errors'; import { goCardlessService, handleGoCardlessError, client, -} from '../gocardless-service.js'; +} from '../gocardless-service'; import { mockedBalances, @@ -31,7 +31,7 @@ import { mockDetailedAccountExample1, mockDetailedAccountExample2, mockExtendAccountsAboutInstitutions, -} from './fixtures.js'; +} from './fixtures'; describe('goCardlessService', () => { const accountId = mockAccountMetaData.id; 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.js index 4078856ed7..a3854e2a36 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.js'; -import IntegrationBank from '../banks/integration-bank.js'; +import { BankFactory, banks } from '../bank-factory'; +import IntegrationBank from '../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.js index 9d43448d9d..cc2c3c2193 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.js'; -import { sortByBookingDateOrValueDate } from '../utils.js'; +import { mockTransactionAmount } from '../services/tests/fixtures'; +import { sortByBookingDateOrValueDate } from '../utils'; describe('utils', () => { describe('#sortByBookingDate', () => { diff --git a/packages/sync-server/src/app-openid.js b/packages/sync-server/src/app-openid.js index 68bd2d3745..7373406d77 100644 --- a/packages/sync-server/src/app-openid.js +++ b/packages/sync-server/src/app-openid.js @@ -1,17 +1,14 @@ import express from 'express'; -import { disableOpenID, enableOpenID, isAdmin } from './account-db.js'; -import { - isValidRedirectUrl, - loginWithOpenIdFinalize, -} from './accounts/openid.js'; -import { checkPassword } from './accounts/password.js'; -import * as UserService from './services/user-service.js'; +import { disableOpenID, enableOpenID, isAdmin } from './account-db'; +import { isValidRedirectUrl, loginWithOpenIdFinalize } from './accounts/openid'; +import { checkPassword } from './accounts/password'; +import * as UserService from './services/user-service'; import { errorMiddleware, requestLoggerMiddleware, validateSessionMiddleware, -} from './util/middlewares.js'; +} from './util/middlewares'; const app = express(); app.use(express.json()); diff --git a/packages/sync-server/src/app-pluggyai/app-pluggyai.js b/packages/sync-server/src/app-pluggyai/app-pluggyai.js index b629adfdda..aa8631428d 100644 --- a/packages/sync-server/src/app-pluggyai/app-pluggyai.js +++ b/packages/sync-server/src/app-pluggyai/app-pluggyai.js @@ -1,10 +1,10 @@ import express from 'express'; -import { handleError } from '../app-gocardless/util/handle-error.js'; -import { SecretName, secretsService } from '../services/secrets-service.js'; -import { requestLoggerMiddleware } from '../util/middlewares.js'; +import { handleError } from '../app-gocardless/util/handle-error'; +import { SecretName, secretsService } from '../services/secrets-service'; +import { requestLoggerMiddleware } from '../util/middlewares'; -import { pluggyaiService } from './pluggyai-service.js'; +import { pluggyaiService } from './pluggyai-service'; const app = express(); export { app as handlers }; diff --git a/packages/sync-server/src/app-pluggyai/pluggyai-service.js b/packages/sync-server/src/app-pluggyai/pluggyai-service.js index 4784e59b0b..1f23e4fd8a 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.js'; +import { SecretName, secretsService } from '../services/secrets-service'; let pluggyClient = null; diff --git a/packages/sync-server/src/app-secrets.js b/packages/sync-server/src/app-secrets.js index ee0b36584b..7c36ad7d63 100644 --- a/packages/sync-server/src/app-secrets.js +++ b/packages/sync-server/src/app-secrets.js @@ -1,11 +1,11 @@ import express from 'express'; -import { getAccountDb, isAdmin } from './account-db.js'; -import { secretsService } from './services/secrets-service.js'; +import { getAccountDb, isAdmin } from './account-db'; +import { secretsService } from './services/secrets-service'; import { requestLoggerMiddleware, validateSessionMiddleware, -} from './util/middlewares.js'; +} from './util/middlewares'; const app = express(); diff --git a/packages/sync-server/src/app-simplefin/app-simplefin.js b/packages/sync-server/src/app-simplefin/app-simplefin.js index ebda334bd6..0299e19fb8 100644 --- a/packages/sync-server/src/app-simplefin/app-simplefin.js +++ b/packages/sync-server/src/app-simplefin/app-simplefin.js @@ -2,9 +2,9 @@ import https from 'https'; import express from 'express'; -import { handleError } from '../app-gocardless/util/handle-error.js'; -import { SecretName, secretsService } from '../services/secrets-service.js'; -import { requestLoggerMiddleware } from '../util/middlewares.js'; +import { handleError } from '../app-gocardless/util/handle-error'; +import { SecretName, secretsService } from '../services/secrets-service'; +import { requestLoggerMiddleware } from '../util/middlewares'; const app = express(); export { app as handlers }; diff --git a/packages/sync-server/src/app-sync.test.ts b/packages/sync-server/src/app-sync.test.ts index e8b4509716..116dc3c220 100644 --- a/packages/sync-server/src/app-sync.test.ts +++ b/packages/sync-server/src/app-sync.test.ts @@ -5,9 +5,9 @@ import fs from 'node:fs'; import { SyncProtoBuf } from '@actual-app/crdt'; import request from 'supertest'; -import { getAccountDb } from './account-db.js'; -import { handlers as app } from './app-sync.js'; -import { getPathForUserFile } from './util/paths.js'; +import { getAccountDb } from './account-db'; +import { handlers as app } from './app-sync'; +import { getPathForUserFile } from './util/paths'; const ADMIN_ROLE = 'ADMIN'; diff --git a/packages/sync-server/src/app-sync.ts b/packages/sync-server/src/app-sync.ts index b9ea23ac99..a1c5606600 100644 --- a/packages/sync-server/src/app-sync.ts +++ b/packages/sync-server/src/app-sync.ts @@ -7,25 +7,25 @@ import { SyncProtoBuf } from '@actual-app/crdt'; import express from 'express'; import { v4 as uuidv4 } from 'uuid'; -import { getAccountDb } from './account-db.js'; -import { FileNotFound } from './app-sync/errors.js'; +import { getAccountDb } from './account-db'; +import { FileNotFound } from './app-sync/errors'; import { File, FilesService, FileUpdate, -} from './app-sync/services/files-service.js'; +} from './app-sync/services/files-service'; import { validateSyncedFile, validateUploadedFile, -} from './app-sync/validation.js'; -import { config } from './load-config.js'; -import * as simpleSync from './sync-simple.js'; +} from './app-sync/validation'; +import { config } from './load-config'; +import * as simpleSync from './sync-simple'; import { errorMiddleware, requestLoggerMiddleware, validateSessionMiddleware, -} from './util/middlewares.js'; -import { getPathForUserFile, getPathForGroupFile } from './util/paths.js'; +} from './util/middlewares'; +import { getPathForUserFile, getPathForGroupFile } from './util/paths'; const app = express(); app.use(validateSessionMiddleware); diff --git a/packages/sync-server/src/app-sync/services/files-service.js b/packages/sync-server/src/app-sync/services/files-service.js index bea40910bf..3138180a73 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.js'; -import { FileNotFound, GenericFileError } from '../errors.js'; +import { getAccountDb, isAdmin } from '../../account-db'; +import { FileNotFound, GenericFileError } from '../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.js index bd889c88eb..76d7371c10 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,12 +1,8 @@ import crypto from 'node:crypto'; -import { getAccountDb } from '../../../account-db.js'; -import { FileNotFound } from '../../errors.js'; -import { - FilesService, - File, - FileUpdate, -} from '../../services/files-service.js'; // Adjust the path as necessary +import { getAccountDb } from '../../../account-db'; +import { FileNotFound } from '../../errors'; +import { FilesService, File, FileUpdate } from '../../services/files-service'; // Adjust the path as necessary describe('FilesService', () => { let filesService; let accountDb; diff --git a/packages/sync-server/src/app.ts b/packages/sync-server/src/app.ts index 079fb2058a..2275430aa7 100644 --- a/packages/sync-server/src/app.ts +++ b/packages/sync-server/src/app.ts @@ -6,17 +6,17 @@ import cors from 'cors'; import express from 'express'; import rateLimit from 'express-rate-limit'; -import { bootstrap } from './account-db.js'; -import * as accountApp from './app-account.js'; -import * as adminApp from './app-admin.js'; -import * as corsApp from './app-cors-proxy.js'; -import * as goCardlessApp from './app-gocardless/app-gocardless.js'; -import * as openidApp from './app-openid.js'; -import * as pluggai from './app-pluggyai/app-pluggyai.js'; -import * as secretApp from './app-secrets.js'; -import * as simpleFinApp from './app-simplefin/app-simplefin.js'; -import * as syncApp from './app-sync.js'; -import { config } from './load-config.js'; +import { bootstrap } from './account-db'; +import * as accountApp from './app-account'; +import * as adminApp from './app-admin'; +import * as corsApp from './app-cors-proxy'; +import * as goCardlessApp from './app-gocardless/app-gocardless'; +import * as openidApp from './app-openid'; +import * as pluggai from './app-pluggyai/app-pluggyai'; +import * as secretApp from './app-secrets'; +import * as simpleFinApp from './app-simplefin/app-simplefin'; +import * as syncApp from './app-sync'; +import { config } from './load-config'; const app = express(); diff --git a/packages/sync-server/src/load-config.test.js b/packages/sync-server/src/load-config.test.js index 26e9c35440..b6dafd7092 100644 --- a/packages/sync-server/src/load-config.test.js +++ b/packages/sync-server/src/load-config.test.js @@ -2,7 +2,7 @@ import convict from 'convict'; import { describe, it, expect, beforeEach, afterEach } from 'vitest'; // Import the custom format -import './load-config.js'; +import './load-config'; describe('tokenExpiration format', () => { let originalEnv; diff --git a/packages/sync-server/src/migrations.js b/packages/sync-server/src/migrations.js index d81ea3fd58..8d002a4f61 100644 --- a/packages/sync-server/src/migrations.js +++ b/packages/sync-server/src/migrations.js @@ -3,7 +3,7 @@ import { fileURLToPath } from 'node:url'; import migrate from 'migrate'; -import { config } from './load-config.js'; +import { config } from './load-config'; export function run(direction = 'up') { console.log( diff --git a/packages/sync-server/src/scripts/disable-openid.js b/packages/sync-server/src/scripts/disable-openid.js index b736b3999f..5706db7f25 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.js'; -import { promptPassword } from '../util/prompt.js'; +} 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.js index 25e1b9e029..bbe42d2fa2 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.js'; -import { config } from '../load-config.js'; +} 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.js index 3fd2082569..0895a1793d 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.js'; +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.js index 142269a9f7..69b299ae8b 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.js'; -import { changePassword } from '../accounts/password.js'; -import { promptPassword } from '../util/prompt.js'; +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.js index b76def17c6..cd335d45a8 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.js'; +import { run } from '../migrations'; const direction = process.argv[2] || 'up'; diff --git a/packages/sync-server/src/secrets.test.js b/packages/sync-server/src/secrets.test.js index 77153a136b..8d580de6ff 100644 --- a/packages/sync-server/src/secrets.test.js +++ b/packages/sync-server/src/secrets.test.js @@ -1,7 +1,7 @@ import request from 'supertest'; -import { handlers as app } from './app-secrets.js'; -import { secretsService } from './services/secrets-service.js'; +import { handlers as app } from './app-secrets'; +import { secretsService } from './services/secrets-service'; describe('secretsService', () => { const testSecretName = 'testSecret'; const testSecretValue = 'testValue'; diff --git a/packages/sync-server/src/services/secrets-service.js b/packages/sync-server/src/services/secrets-service.js index 8206526282..39ad30c05d 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.js'; +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.js index 8c39cc47a1..11b43f95eb 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.js'; +import { getAccountDb } from '../account-db'; export function getUserByUsername(userName) { if (!userName || typeof userName !== 'string') { diff --git a/packages/sync-server/src/sync-simple.js b/packages/sync-server/src/sync-simple.js index e3d041fb68..de8eb4a4e8 100644 --- a/packages/sync-server/src/sync-simple.js +++ b/packages/sync-server/src/sync-simple.js @@ -3,9 +3,9 @@ import { join } from 'node:path'; import { merkle, SyncProtoBuf, Timestamp } from '@actual-app/crdt'; -import { openDatabase } from './db.js'; -import { sqlDir } from './load-config.js'; -import { getPathForGroupFile } from './util/paths.js'; +import { openDatabase } from './db'; +import { sqlDir } from './load-config'; +import { getPathForGroupFile } from './util/paths'; function getGroupDb(groupId) { const path = getPathForGroupFile(groupId); diff --git a/packages/sync-server/src/util/middlewares.js b/packages/sync-server/src/util/middlewares.js index 9db5bdae52..9d1fe9cf69 100644 --- a/packages/sync-server/src/util/middlewares.js +++ b/packages/sync-server/src/util/middlewares.js @@ -1,7 +1,7 @@ import * as expressWinston from 'express-winston'; import * as winston from 'winston'; -import { validateSession } from './validate-user.js'; +import { validateSession } from './validate-user'; /** * @param {Error} err diff --git a/packages/sync-server/src/util/paths.js b/packages/sync-server/src/util/paths.js index 5d3567c3c6..842bb1848e 100644 --- a/packages/sync-server/src/util/paths.js +++ b/packages/sync-server/src/util/paths.js @@ -1,6 +1,6 @@ import { join, resolve } from 'node:path'; -import { config } from '../load-config.js'; +import { config } from '../load-config'; /** @param {string} fileId */ export function getPathForUserFile(fileId) { diff --git a/packages/sync-server/src/util/payee-name.js b/packages/sync-server/src/util/payee-name.js index 14df467b9d..e895eab5bf 100644 --- a/packages/sync-server/src/util/payee-name.js +++ b/packages/sync-server/src/util/payee-name.js @@ -1,4 +1,4 @@ -import { title } from './title/index.js'; +import { title } from './title/index'; function formatPayeeIban(iban) { return '(' + iban.slice(0, 4) + ' XXX ' + iban.slice(-4) + ')'; diff --git a/packages/sync-server/src/util/title/index.js b/packages/sync-server/src/util/title/index.js index 2995c76aef..6330ef8b7b 100644 --- a/packages/sync-server/src/util/title/index.js +++ b/packages/sync-server/src/util/title/index.js @@ -1,6 +1,6 @@ // Utilities -import { lowerCaseSet } from './lower-case.js'; -import { specials } from './specials.js'; +import { lowerCaseSet } from './lower-case'; +import { specials } from './specials'; const character = '[0-9\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376-\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0523\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0621-\u064A\u066E-\u066F\u0671-\u06D3\u06D5\u06E5-\u06E6\u06EE-\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4-\u07F5\u07FA\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0972\u097B-\u097F\u0985-\u098C\u098F-\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC-\u09DD\u09DF-\u09E1\u09F0-\u09F1\u0A05-\u0A0A\u0A0F-\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32-\u0A33\u0A35-\u0A36\u0A38-\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2-\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0-\u0AE1\u0B05-\u0B0C\u0B0F-\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32-\u0B33\u0B35-\u0B39\u0B3D\u0B5C-\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99-\u0B9A\u0B9C\u0B9E-\u0B9F\u0BA3-\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58-\u0C59\u0C60-\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0-\u0CE1\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D3D\u0D60-\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32-\u0E33\u0E40-\u0E46\u0E81-\u0E82\u0E84\u0E87-\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA-\u0EAB\u0EAD-\u0EB0\u0EB2-\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDD\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8B\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065-\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10D0-\u10FA\u10FC\u1100-\u1159\u115F-\u11A2\u11A8-\u11F9\u1200-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u1676\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F0\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19A9\u19C1-\u19C7\u1A00-\u1A16\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE-\u1BAF\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u2094\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2C6F\u2C71-\u2C7D\u2C80-\u2CE4\u2D00-\u2D25\u2D30-\u2D65\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31B7\u31F0-\u31FF\u3400\u4DB5\u4E00\u9FC3\uA000-\uA48C\uA500-\uA60C\uA610-\uA61F\uA62A-\uA62B\uA640-\uA65F\uA662-\uA66E\uA67F-\uA697\uA717-\uA71F\uA722-\uA788\uA78B-\uA78C\uA7FB-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA90A-\uA925\uA930-\uA946\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAC00\uD7A3\uF900-\uFA2D\uFA30-\uFA6A\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40-\uFB41\uFB43-\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]'; diff --git a/packages/sync-server/src/util/validate-user.js b/packages/sync-server/src/util/validate-user.js index 4075a6b4d6..ff84b6a9ba 100644 --- a/packages/sync-server/src/util/validate-user.js +++ b/packages/sync-server/src/util/validate-user.js @@ -1,7 +1,7 @@ import ipaddr from 'ipaddr.js'; -import { getSession } from '../account-db.js'; -import { config } from '../load-config.js'; +import { getSession } from '../account-db'; +import { config } from '../load-config'; export const TOKEN_EXPIRATION_NEVER = -1; const MS_PER_SECOND = 1000; diff --git a/packages/sync-server/tsconfig.json b/packages/sync-server/tsconfig.json index d88ba24cfb..0c9b5aebc4 100644 --- a/packages/sync-server/tsconfig.json +++ b/packages/sync-server/tsconfig.json @@ -1,10 +1,7 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - // DOM for URL global in Node 16+ "lib": ["ES2021"], - "module": "node16", - "moduleResolution": "node16", "noEmit": false, "outDir": "build" }, diff --git a/packages/sync-server/vitest.globalSetup.js b/packages/sync-server/vitest.globalSetup.js index e728c7e73a..51aa8392a5 100644 --- a/packages/sync-server/vitest.globalSetup.js +++ b/packages/sync-server/vitest.globalSetup.js @@ -1,5 +1,5 @@ -import { getAccountDb } from './src/account-db.js'; -import { run as runMigrations } from './src/migrations.js'; +import { getAccountDb } from './src/account-db'; +import { run as runMigrations } from './src/migrations'; const GENERIC_ADMIN_ID = 'genericAdmin'; const GENERIC_USER_ID = 'genericUser'; diff --git a/upcoming-release-notes/6179.md b/upcoming-release-notes/6179.md new file mode 100644 index 0000000000..a581e010f3 --- /dev/null +++ b/upcoming-release-notes/6179.md @@ -0,0 +1,6 @@ +--- +category: Maintenance +authors: [MatissJanis] +--- + +Remove usage of file extensions in sync-server