Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
🤖 Auto commit for release 'develop' on 2025-06-08
JC5e3bab9d7d822
diff --git a/app/Factory/PiggyBankFactory.php b/app/Factory/PiggyBankFactory.phpindex 82ed9cae35..eefd1436e5 100644--- a/app/Factory/PiggyBankFactory.php+++ b/app/Factory/PiggyBankFactory.php@@ -53,8 +53,8 @@ class PiggyBankFactorypublic function __construct(){- $this->currencyRepository = app(CurrencyRepositoryInterface::class);- $this->accountRepository = app(AccountRepositoryInterface::class);+ $this->currencyRepository = app(CurrencyRepositoryInterface::class);+ $this->accountRepository = app(AccountRepositoryInterface::class);$this->piggyBankRepository = app(PiggyBankRepositoryInterface::class);}@@ -72,7 +72,7 @@ class PiggyBankFactorypublic function store(array $data): PiggyBank{- $piggyBankData = $data;+ $piggyBankData = $data;// unset some fieldsunset($piggyBankData['object_group_title'], $piggyBankData['transaction_currency_code'], $piggyBankData['transaction_currency_id'], $piggyBankData['accounts'], $piggyBankData['object_group_id'], $piggyBankData['notes']);@@ -82,11 +82,11 @@ class PiggyBankFactory$piggyBankData['target_amount'] = '0';}- $piggyBankData['start_date_tz'] = $piggyBankData['start_date']?->format('e');- $piggyBankData['target_date_tz'] = $piggyBankData['target_date']?->format('e');- $piggyBankData['account_id'] = null;+ $piggyBankData['start_date_tz'] = $piggyBankData['start_date']?->format('e');+ $piggyBankData['target_date_tz'] = $piggyBankData['target_date']?->format('e');+ $piggyBankData['account_id'] = null;$piggyBankData['transaction_currency_id'] = $this->getCurrency($data)->id;- $piggyBankData['order'] = 131337;+ $piggyBankData['order'] = 131337;try {/** @var PiggyBank $piggyBank */@@ -96,11 +96,11 @@ class PiggyBankFactorythrow new FireflyException('400005: Could not store new piggy bank.', 0, $e);}- $piggyBank = $this->setOrder($piggyBank, $data);+ $piggyBank = $this->setOrder($piggyBank, $data);$this->linkToAccountIds($piggyBank, $data['accounts']);$this->piggyBankRepository->updateNote($piggyBank, $data['notes']);- $objectGroupTitle = $data['object_group_title'] ?? '';+ $objectGroupTitle = $data['object_group_title'] ?? '';if ('' !== $objectGroupTitle) {$objectGroup = $this->findOrCreateObjectGroup($objectGroupTitle);if ($objectGroup instanceof ObjectGroup) {@@ -108,7 +108,7 @@ class PiggyBankFactory}}// try also with ID- $objectGroupId = (int)($data['object_group_id'] ?? 0);+ $objectGroupId = (int)($data['object_group_id'] ?? 0);if (0 !== $objectGroupId) {$objectGroup = $this->findObjectGroupById($objectGroupId);if ($objectGroup instanceof ObjectGroup) {@@ -116,7 +116,7 @@ class PiggyBankFactory}}Log::debug('Touch piggy bank');- $piggyBank->encrypted = false;+ $piggyBank->encrypted = false;$piggyBank->save();$piggyBank->touch();@@ -127,7 +127,7 @@ class PiggyBankFactory{// currency:$defaultCurrency = app('amount')->getNativeCurrency();- $currency = null;+ $currency = null;if (array_key_exists('transaction_currency_code', $data)) {$currency = $this->currencyRepository->findByCode((string)($data['transaction_currency_code'] ?? ''));}@@ -141,7 +141,7 @@ class PiggyBankFactorypublic function find(?int $piggyBankId, ?string $piggyBankName): ?PiggyBank{- $piggyBankId = (int)$piggyBankId;+ $piggyBankId = (int)$piggyBankId;$piggyBankName = (string)$piggyBankName;if ('' === $piggyBankName && 0 === $piggyBankId) {return null;@@ -152,7 +152,8 @@ class PiggyBankFactory->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')->where('accounts.user_id', $this->user->id)->where('piggy_banks.id', $piggyBankId)- ->first(['piggy_banks.*']);+ ->first(['piggy_banks.*'])+ ;if (null !== $piggyBank) {return $piggyBank;}@@ -176,13 +177,14 @@ class PiggyBankFactory->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')->where('accounts.user_id', $this->user->id)->where('piggy_banks.name', $name)- ->first(['piggy_banks.*']);+ ->first(['piggy_banks.*'])+ ;}private function setOrder(PiggyBank $piggyBank, array $data): PiggyBank{$this->resetOrder();- $order = $this->getMaxOrder() + 1;+ $order = $this->getMaxOrder() + 1;if (array_key_exists('order', $data)) {$order = $data['order'];}@@ -196,7 +198,7 @@ class PiggyBankFactorypublic function resetOrder(): void{// TODO duplicate code- $set = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')+ $set = PiggyBank::leftJoin('account_piggy_bank', 'account_piggy_bank.piggy_bank_id', '=', 'piggy_banks.id')->leftJoin('accounts', 'accounts.id', '=', 'account_piggy_bank.account_id')->where('accounts.user_id', $this->user->id)->with(@@ -204,7 +206,8 @@ class PiggyBankFactory'objectGroups',])- ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*']);+ ->orderBy('piggy_banks.order', 'ASC')->get(['piggy_banks.*'])+ ;$current = 1;foreach ($set as $piggyBank) {if ($piggyBank->order !== $current) {@@ -227,7 +230,7 @@ class PiggyBankFactoryLog::debug(sprintf('Linking piggy bank #%d to %d accounts.', $piggyBank->id, count($accounts)), $accounts);// collect current current_amount so the sync does not remove them.// TODO this is a tedious check. Feels like a hack.- $toBeLinked = [];+ $toBeLinked = [];$oldSavedAmount = $this->piggyBankRepository->getCurrentAmount($piggyBank);foreach ($piggyBank->accounts as $account) {Log::debug(sprintf('Checking account #%d', $account->id));@@ -250,8 +253,8 @@ class PiggyBankFactory}if (array_key_exists('current_amount', $info) && null !== $info['current_amount']) {// an amount is set, first check out if there is a difference with the previous amount.- $previous = $toBeLinked[$account->id]['current_amount'] ?? '0';- $diff = bcsub($info['current_amount'], $previous);+ $previous = $toBeLinked[$account->id]['current_amount'] ?? '0';+ $diff = bcsub($info['current_amount'], $previous);// create event for difference.if (0 !== bccomp($diff, '0')) {@@ -264,8 +267,8 @@ class PiggyBankFactory}if (array_key_exists('current_amount', $info) && null === $info['current_amount']) {// an amount is set, first check out if there is a difference with the previous amount.- $previous = $toBeLinked[$account->id]['current_amount'] ?? '0';- $diff = bcsub('0', $previous);+ $previous = $toBeLinked[$account->id]['current_amount'] ?? '0';+ $diff = bcsub('0', $previous);// create event for difference.if (0 !== bccomp($diff, '0')) {diff --git a/app/Http/Controllers/RuleGroup/ExecutionController.php b/app/Http/Controllers/RuleGroup/ExecutionController.phpindex 1797dc05db..4f1b3137b2 100644--- a/app/Http/Controllers/RuleGroup/ExecutionController.php+++ b/app/Http/Controllers/RuleGroup/ExecutionController.php@@ -87,7 +87,7 @@ class ExecutionController extends Controller// set rules:// #10427, file rule group and not the set of rules.- $collection = new Collection([$ruleGroup]);+ $collection = new Collection([$ruleGroup]);$newRuleEngine->setRuleGroups($collection);$newRuleEngine->fire();diff --git a/app/Support/Steam.php b/app/Support/Steam.phpindex 6644f9d3d1..40f51114cb 100644--- a/app/Support/Steam.php+++ b/app/Support/Steam.php@@ -279,7 +279,7 @@ class Steam// make sure sum is a string:$sumOfDay = (string) ($entry->sum_of_day ?? '0');// #10426 make sure sum is not in scientific notation.- $sumOfDay = $this->floatalize($sumOfDay);+ $sumOfDay = $this->floatalize($sumOfDay);// find currency of this entry, does not have to exist.$currencies[$entry->transaction_currency_id] ??= TransactionCurrency::find($entry->transaction_currency_id);diff --git a/composer.lock b/composer.lockindex 63e338ba8d..5decaaaabb 100644--- a/composer.lock+++ b/composer.lock@@ -11551,16 +11551,16 @@},{"name": "phpunit/phpunit",- "version": "12.1.6",+ "version": "12.2.1","source": {"type": "git","url": "https://github.com/sebastianbergmann/phpunit.git",- "reference": "2fdf0056c673c8f0f1eed00030be5f8243c1e6e0"+ "reference": "5f09fda04e7caea93cff50b4e90319184f3e6ee3"},"dist": {"type": "zip",- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2fdf0056c673c8f0f1eed00030be5f8243c1e6e0",- "reference": "2fdf0056c673c8f0f1eed00030be5f8243c1e6e0",+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5f09fda04e7caea93cff50b4e90319184f3e6ee3",+ "reference": "5f09fda04e7caea93cff50b4e90319184f3e6ee3","shasum": ""},"require": {@@ -11574,7 +11574,7 @@"phar-io/manifest": "^2.0.4","phar-io/version": "^3.2.1","php": ">=8.3",- "phpunit/php-code-coverage": "^12.2.1",+ "phpunit/php-code-coverage": "^12.3.0","phpunit/php-file-iterator": "^6.0.0","phpunit/php-invoker": "^6.0.0","phpunit/php-text-template": "^5.0.0",@@ -11582,7 +11582,7 @@"sebastian/cli-parser": "^4.0.0","sebastian/comparator": "^7.0.1","sebastian/diff": "^7.0.0",- "sebastian/environment": "^8.0.1",+ "sebastian/environment": "^8.0.2","sebastian/exporter": "^7.0.0","sebastian/global-state": "^8.0.0","sebastian/object-enumerator": "^7.0.0",@@ -11596,7 +11596,7 @@"type": "library","extra": {"branch-alias": {- "dev-main": "12.1-dev"+ "dev-main": "12.2-dev"}},"autoload": {@@ -11628,7 +11628,7 @@"support": {"issues": "https://github.com/sebastianbergmann/phpunit/issues","security": "https://github.com/sebastianbergmann/phpunit/security/policy",- "source": "https://github.com/sebastianbergmann/phpunit/tree/12.1.6"+ "source": "https://github.com/sebastianbergmann/phpunit/tree/12.2.1"},"funding": [{@@ -11652,7 +11652,7 @@"type": "tidelift"}],- "time": "2025-05-21T12:36:31+00:00"+ "time": "2025-06-07T05:17:47+00:00"},{"name": "rector/rector",diff --git a/config/firefly.php b/config/firefly.phpindex f24b1aa6c3..ebb3aa53c0 100644--- a/config/firefly.php+++ b/config/firefly.php@@ -78,7 +78,7 @@ return ['running_balance_column' => env('USE_RUNNING_BALANCE', false),// see cer.php for exchange rates feature flag.],- 'version' => 'develop/2025-06-04',+ 'version' => 'develop/2025-06-08','api_version' => '2.1.0', // field is no longer used.'db_version' => 25,diff --git a/package-lock.json b/package-lock.jsonindex 231d641e52..1cfec35d79 100644--- a/package-lock.json+++ b/package-lock.json@@ -392,14 +392,14 @@}},"node_modules/@babel/helpers": {- "version": "7.27.4",- "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.4.tgz",- "integrity": "sha512-Y+bO6U+I7ZKaM5G5rDUZiYfUvQPUibYmAFe7EnKdnKBbVXDZxvp+MWOH5gYciY0EPk4EScsuFMQBbEfpdRKSCQ==",+ "version": "7.27.6",+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.6.tgz",+ "integrity": "sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==","dev": true,"license": "MIT","dependencies": {"@babel/template": "^7.27.2",- "@babel/types": "^7.27.3"+ "@babel/types": "^7.27.6"},"engines": {"node": ">=6.9.0"@@ -1592,9 +1592,9 @@}},"node_modules/@babel/runtime": {- "version": "7.27.4",- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.4.tgz",- "integrity": "sha512-t3yaEOuGu9NlIZ+hIeGbBjFtZT7j2cb2tg0fuaJKeGotchRjjLfrBA9Kwf8quhpP1EUuxModQg04q/mBwyg8uA==",+ "version": "7.27.6",+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.6.tgz",+ "integrity": "sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==","license": "MIT","engines": {"node": ">=6.9.0"@@ -1635,9 +1635,9 @@}},"node_modules/@babel/types": {- "version": "7.27.3",- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.3.tgz",- "integrity": "sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==",+ "version": "7.27.6",+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.6.tgz",+ "integrity": "sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==","dev": true,"license": "MIT","dependencies": {@@ -2552,9 +2552,9 @@}},"node_modules/@rollup/rollup-android-arm-eabi": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.41.1.tgz",- "integrity": "sha512-NELNvyEWZ6R9QMkiytB4/L4zSEaBC03KIXEghptLGLZWJ6VPrL63ooZQCOnlx36aQPGhzuOMwDerC1Eb2VmrLw==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.42.0.tgz",+ "integrity": "sha512-gldmAyS9hpj+H6LpRNlcjQWbuKUtb94lodB9uCz71Jm+7BxK1VIOo7y62tZZwxhA7j1ylv/yQz080L5WkS+LoQ==","cpu": ["arm"],@@ -2566,9 +2566,9 @@]},"node_modules/@rollup/rollup-android-arm64": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.41.1.tgz",- "integrity": "sha512-DXdQe1BJ6TK47ukAoZLehRHhfKnKg9BjnQYUu9gzhI8Mwa1d2fzxA1aw2JixHVl403bwp1+/o/NhhHtxWJBgEA==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.42.0.tgz",+ "integrity": "sha512-bpRipfTgmGFdCZDFLRvIkSNO1/3RGS74aWkJJTFJBH7h3MRV4UijkaEUeOMbi9wxtxYmtAbVcnMtHTPBhLEkaw==","cpu": ["arm64"],@@ -2580,9 +2580,9 @@]},"node_modules/@rollup/rollup-darwin-arm64": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.41.1.tgz",- "integrity": "sha512-5afxvwszzdulsU2w8JKWwY8/sJOLPzf0e1bFuvcW5h9zsEg+RQAojdW0ux2zyYAz7R8HvvzKCjLNJhVq965U7w==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.42.0.tgz",+ "integrity": "sha512-JxHtA081izPBVCHLKnl6GEA0w3920mlJPLh89NojpU2GsBSB6ypu4erFg/Wx1qbpUbepn0jY4dVWMGZM8gplgA==","cpu": ["arm64"],@@ -2594,9 +2594,9 @@]},"node_modules/@rollup/rollup-darwin-x64": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.41.1.tgz",- "integrity": "sha512-egpJACny8QOdHNNMZKf8xY0Is6gIMz+tuqXlusxquWu3F833DcMwmGM7WlvCO9sB3OsPjdC4U0wHw5FabzCGZg==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.42.0.tgz",+ "integrity": "sha512-rv5UZaWVIJTDMyQ3dCEK+m0SAn6G7H3PRc2AZmExvbDvtaDc+qXkei0knQWcI3+c9tEs7iL/4I4pTQoPbNL2SA==","cpu": ["x64"],@@ -2608,9 +2608,9 @@]},"node_modules/@rollup/rollup-freebsd-arm64": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.41.1.tgz",- "integrity": "sha512-DBVMZH5vbjgRk3r0OzgjS38z+atlupJ7xfKIDJdZZL6sM6wjfDNo64aowcLPKIx7LMQi8vybB56uh1Ftck/Atg==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.42.0.tgz",+ "integrity": "sha512-fJcN4uSGPWdpVmvLuMtALUFwCHgb2XiQjuECkHT3lWLZhSQ3MBQ9pq+WoWeJq2PrNxr9rPM1Qx+IjyGj8/c6zQ==","cpu": ["arm64"],@@ -2622,9 +2622,9 @@]},"node_modules/@rollup/rollup-freebsd-x64": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.41.1.tgz",- "integrity": "sha512-3FkydeohozEskBxNWEIbPfOE0aqQgB6ttTkJ159uWOFn42VLyfAiyD9UK5mhu+ItWzft60DycIN1Xdgiy8o/SA==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.42.0.tgz",+ "integrity": "sha512-CziHfyzpp8hJpCVE/ZdTizw58gr+m7Y2Xq5VOuCSrZR++th2xWAz4Nqk52MoIIrV3JHtVBhbBsJcAxs6NammOQ==","cpu": ["x64"],@@ -2636,9 +2636,9 @@]},"node_modules/@rollup/rollup-linux-arm-gnueabihf": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.41.1.tgz",- "integrity": "sha512-wC53ZNDgt0pqx5xCAgNunkTzFE8GTgdZ9EwYGVcg+jEjJdZGtq9xPjDnFgfFozQI/Xm1mh+D9YlYtl+ueswNEg==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.42.0.tgz",+ "integrity": "sha512-UsQD5fyLWm2Fe5CDM7VPYAo+UC7+2Px4Y+N3AcPh/LdZu23YcuGPegQly++XEVaC8XUTFVPscl5y5Cl1twEI4A==","cpu": ["arm"],@@ -2650,9 +2650,9 @@]},"node_modules/@rollup/rollup-linux-arm-musleabihf": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.41.1.tgz",- "integrity": "sha512-jwKCca1gbZkZLhLRtsrka5N8sFAaxrGz/7wRJ8Wwvq3jug7toO21vWlViihG85ei7uJTpzbXZRcORotE+xyrLA==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.42.0.tgz",+ "integrity": "sha512-/i8NIrlgc/+4n1lnoWl1zgH7Uo0XK5xK3EDqVTf38KvyYgCU/Rm04+o1VvvzJZnVS5/cWSd07owkzcVasgfIkQ==","cpu": ["arm"],@@ -2664,9 +2664,9 @@]},"node_modules/@rollup/rollup-linux-arm64-gnu": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.41.1.tgz",- "integrity": "sha512-g0UBcNknsmmNQ8V2d/zD2P7WWfJKU0F1nu0k5pW4rvdb+BIqMm8ToluW/eeRmxCared5dD76lS04uL4UaNgpNA==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.42.0.tgz",+ "integrity": "sha512-eoujJFOvoIBjZEi9hJnXAbWg+Vo1Ov8n/0IKZZcPZ7JhBzxh2A+2NFyeMZIRkY9iwBvSjloKgcvnjTbGKHE44Q==","cpu": ["arm64"],@@ -2678,9 +2678,9 @@]},"node_modules/@rollup/rollup-linux-arm64-musl": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.41.1.tgz",- "integrity": "sha512-XZpeGB5TKEZWzIrj7sXr+BEaSgo/ma/kCgrZgL0oo5qdB1JlTzIYQKel/RmhT6vMAvOdM2teYlAaOGJpJ9lahg==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.42.0.tgz",+ "integrity": "sha512-/3NrcOWFSR7RQUQIuZQChLND36aTU9IYE4j+TB40VU78S+RA0IiqHR30oSh6P1S9f9/wVOenHQnacs/Byb824g==","cpu": ["arm64"],@@ -2692,9 +2692,9 @@]},"node_modules/@rollup/rollup-linux-loongarch64-gnu": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.41.1.tgz",- "integrity": "sha512-bkCfDJ4qzWfFRCNt5RVV4DOw6KEgFTUZi2r2RuYhGWC8WhCA8lCAJhDeAmrM/fdiAH54m0mA0Vk2FGRPyzI+tw==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.42.0.tgz",+ "integrity": "sha512-O8AplvIeavK5ABmZlKBq9/STdZlnQo7Sle0LLhVA7QT+CiGpNVe197/t8Aph9bhJqbDVGCHpY2i7QyfEDDStDg==","cpu": ["loong64"],@@ -2706,9 +2706,9 @@]},"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.41.1.tgz",- "integrity": "sha512-3mr3Xm+gvMX+/8EKogIZSIEF0WUu0HL9di+YWlJpO8CQBnoLAEL/roTCxuLncEdgcfJcvA4UMOf+2dnjl4Ut1A==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.42.0.tgz",+ "integrity": "sha512-6Qb66tbKVN7VyQrekhEzbHRxXXFFD8QKiFAwX5v9Xt6FiJ3BnCVBuyBxa2fkFGqxOCSGGYNejxd8ht+q5SnmtA==","cpu": ["ppc64"],@@ -2720,9 +2720,9 @@]},"node_modules/@rollup/rollup-linux-riscv64-gnu": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.41.1.tgz",- "integrity": "sha512-3rwCIh6MQ1LGrvKJitQjZFuQnT2wxfU+ivhNBzmxXTXPllewOF7JR1s2vMX/tWtUYFgphygxjqMl76q4aMotGw==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.42.0.tgz",+ "integrity": "sha512-KQETDSEBamQFvg/d8jajtRwLNBlGc3aKpaGiP/LvEbnmVUKlFta1vqJqTrvPtsYsfbE/DLg5CC9zyXRX3fnBiA==","cpu": ["riscv64"],@@ -2734,9 +2734,9 @@]},"node_modules/@rollup/rollup-linux-riscv64-musl": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.41.1.tgz",- "integrity": "sha512-LdIUOb3gvfmpkgFZuccNa2uYiqtgZAz3PTzjuM5bH3nvuy9ty6RGc/Q0+HDFrHrizJGVpjnTZ1yS5TNNjFlklw==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.42.0.tgz",+ "integrity": "sha512-qMvnyjcU37sCo/tuC+JqeDKSuukGAd+pVlRl/oyDbkvPJ3awk6G6ua7tyum02O3lI+fio+eM5wsVd66X0jQtxw==","cpu": ["riscv64"],@@ -2748,9 +2748,9 @@]},"node_modules/@rollup/rollup-linux-s390x-gnu": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.41.1.tgz",- "integrity": "sha512-oIE6M8WC9ma6xYqjvPhzZYk6NbobIURvP/lEbh7FWplcMO6gn7MM2yHKA1eC/GvYwzNKK/1LYgqzdkZ8YFxR8g==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.42.0.tgz",+ "integrity": "sha512-I2Y1ZUgTgU2RLddUHXTIgyrdOwljjkmcZ/VilvaEumtS3Fkuhbw4p4hgHc39Ypwvo2o7sBFNl2MquNvGCa55Iw==","cpu": ["s390x"],@@ -2762,9 +2762,9 @@]},"node_modules/@rollup/rollup-linux-x64-gnu": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.41.1.tgz",- "integrity": "sha512-cWBOvayNvA+SyeQMp79BHPK8ws6sHSsYnK5zDcsC3Hsxr1dgTABKjMnMslPq1DvZIp6uO7kIWhiGwaTdR4Og9A==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.42.0.tgz",+ "integrity": "sha512-Gfm6cV6mj3hCUY8TqWa63DB8Mx3NADoFwiJrMpoZ1uESbK8FQV3LXkhfry+8bOniq9pqY1OdsjFWNsSbfjPugw==","cpu": ["x64"],@@ -2776,9 +2776,9 @@]},"node_modules/@rollup/rollup-linux-x64-musl": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.41.1.tgz",- "integrity": "sha512-y5CbN44M+pUCdGDlZFzGGBSKCA4A/J2ZH4edTYSSxFg7ce1Xt3GtydbVKWLlzL+INfFIZAEg1ZV6hh9+QQf9YQ==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.42.0.tgz",+ "integrity": "sha512-g86PF8YZ9GRqkdi0VoGlcDUb4rYtQKyTD1IVtxxN4Hpe7YqLBShA7oHMKU6oKTCi3uxwW4VkIGnOaH/El8de3w==","cpu": ["x64"],@@ -2790,9 +2790,9 @@]},"node_modules/@rollup/rollup-win32-arm64-msvc": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.41.1.tgz",- "integrity": "sha512-lZkCxIrjlJlMt1dLO/FbpZbzt6J/A8p4DnqzSa4PWqPEUUUnzXLeki/iyPLfV0BmHItlYgHUqJe+3KiyydmiNQ==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.42.0.tgz",+ "integrity": "sha512-+axkdyDGSp6hjyzQ5m1pgcvQScfHnMCcsXkx8pTgy/6qBmWVhtRVlgxjWwDp67wEXXUr0x+vD6tp5W4x6V7u1A==","cpu": ["arm64"],@@ -2804,9 +2804,9 @@]},"node_modules/@rollup/rollup-win32-ia32-msvc": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.41.1.tgz",- "integrity": "sha512-+psFT9+pIh2iuGsxFYYa/LhS5MFKmuivRsx9iPJWNSGbh2XVEjk90fmpUEjCnILPEPJnikAU6SFDiEUyOv90Pg==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.42.0.tgz",+ "integrity": "sha512-F+5J9pelstXKwRSDq92J0TEBXn2nfUrQGg+HK1+Tk7VOL09e0gBqUHugZv7SW4MGrYj41oNCUe3IKCDGVlis2g==","cpu": ["ia32"],@@ -2818,9 +2818,9 @@]},"node_modules/@rollup/rollup-win32-x64-msvc": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.41.1.tgz",- "integrity": "sha512-Wq2zpapRYLfi4aKxf2Xff0tN+7slj2d4R87WEzqw7ZLsVvO5zwYCIuEGSZYiK41+GlwUo1HiR+GdkLEJnCKTCw==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.42.0.tgz",+ "integrity": "sha512-LpHiJRwkaVz/LqjHjK8LCi8osq7elmpwujwbXKNW88bM8eeGxavJIKKjkjpMHAh/2xfnrt1ZSnhTv41WYUHYmA==","cpu": ["x64"],@@ -2887,9 +2887,9 @@}},"node_modules/@types/body-parser": {- "version": "1.19.5",- "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",- "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",+ "version": "1.19.6",+ "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.6.tgz",+ "integrity": "sha512-HLFeCYgz89uk22N5Qg3dvGvsv46B8GLvKKo1zKG4NybA8U2DiEO3w9lqGg29t/tfLRJpJ6iQxnVw4OnB7MoM9g==","dev": true,"license": "MIT","dependencies": {@@ -2969,9 +2969,9 @@"license": "MIT"},"node_modules/@types/express": {- "version": "4.17.22",- "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.22.tgz",- "integrity": "sha512-eZUmSnhRX9YRSkplpz0N+k6NljUUn5l3EWZIKZvYzhvMphEuNiyyy1viH/ejgt66JWgALwC/gtSUAeQKtSwW/w==",+ "version": "4.17.23",+ "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.23.tgz",+ "integrity": "sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==","dev": true,"license": "MIT","dependencies": {@@ -3019,9 +3019,9 @@}},"node_modules/@types/http-errors": {- "version": "2.0.4",- "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",- "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==",+ "version": "2.0.5",+ "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.5.tgz",+ "integrity": "sha512-r8Tayk8HJnX0FztbZN7oVqGccWgw98T/0neJphO91KkmOzug1KkofZURD4UaD5uH8AqcFLfdPErnBod0u71/qg==","dev": true,"license": "MIT"},@@ -3108,9 +3108,9 @@"license": "MIT"},"node_modules/@types/node": {- "version": "22.15.29",- "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.29.tgz",- "integrity": "sha512-LNdjOkUDlU1RZb8e1kOIUpN1qQUlzGkEtbVNo53vbrwDg5om6oduhm4SiUaPW5ASTXhAiP0jInWG8Qx9fVlOeQ==",+ "version": "22.15.30",+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.30.tgz",+ "integrity": "sha512-6Q7lr06bEHdlfplU6YRbgG1SFBdlsfNC4/lX+SkhiTs0cpJkOElmWls8PxDFv4yY/xKb8Y6SO0OmSX4wgqTZbA==","dev": true,"license": "MIT","dependencies": {@@ -3156,9 +3156,9 @@"license": "MIT"},"node_modules/@types/send": {- "version": "0.17.4",- "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",- "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",+ "version": "0.17.5",+ "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.5.tgz",+ "integrity": "sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==","dev": true,"license": "MIT","dependencies": {@@ -3177,9 +3177,9 @@}},"node_modules/@types/serve-static": {- "version": "1.15.7",- "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",- "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",+ "version": "1.15.8",+ "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.8.tgz",+ "integrity": "sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==","dev": true,"license": "MIT","dependencies": {@@ -6322,15 +6322,16 @@}},"node_modules/form-data": {- "version": "4.0.2",- "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",- "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",+ "version": "4.0.3",+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",+ "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==","dev": true,"license": "MIT","dependencies": {"asynckit": "^0.4.0","combined-stream": "^1.0.8","es-set-tostringtag": "^2.1.0",+ "hasown": "^2.0.2","mime-types": "^2.1.12"},"engines": {@@ -9973,9 +9974,9 @@}},"node_modules/rollup": {- "version": "4.41.1",- "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.41.1.tgz",- "integrity": "sha512-cPmwD3FnFv8rKMBc1MxWCwVQFxwf1JEmSX3iQXrRVVG15zerAIXRjMFVWnd5Q5QvgKF7Aj+5ykXFhUl+QGnyOw==",+ "version": "4.42.0",+ "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.42.0.tgz",+ "integrity": "sha512-LW+Vse3BJPyGJGAJt1j8pWDKPd73QM8cRXYK1IxOBgL2AGLu7Xd2YOW0M2sLUBCkF5MshXXtMApyEAEzMVMsnw==","dev": true,"license": "MIT","dependencies": {@@ -9989,26 +9990,26 @@"npm": ">=8.0.0"},"optionalDependencies": {- "@rollup/rollup-android-arm-eabi": "4.41.1",- "@rollup/rollup-android-arm64": "4.41.1",- "@rollup/rollup-darwin-arm64": "4.41.1",- "@rollup/rollup-darwin-x64": "4.41.1",- "@rollup/rollup-freebsd-arm64": "4.41.1",- "@rollup/rollup-freebsd-x64": "4.41.1",- "@rollup/rollup-linux-arm-gnueabihf": "4.41.1",- "@rollup/rollup-linux-arm-musleabihf": "4.41.1",- "@rollup/rollup-linux-arm64-gnu": "4.41.1",- "@rollup/rollup-linux-arm64-musl": "4.41.1",- "@rollup/rollup-linux-loongarch64-gnu": "4.41.1",- "@rollup/rollup-linux-powerpc64le-gnu": "4.41.1",- "@rollup/rollup-linux-riscv64-gnu": "4.41.1",- "@rollup/rollup-linux-riscv64-musl": "4.41.1",- "@rollup/rollup-linux-s390x-gnu": "4.41.1",- "@rollup/rollup-linux-x64-gnu": "4.41.1",- "@rollup/rollup-linux-x64-musl": "4.41.1",- "@rollup/rollup-win32-arm64-msvc": "4.41.1",- "@rollup/rollup-win32-ia32-msvc": "4.41.1",- "@rollup/rollup-win32-x64-msvc": "4.41.1",+ "@rollup/rollup-android-arm-eabi": "4.42.0",+ "@rollup/rollup-android-arm64": "4.42.0",+ "@rollup/rollup-darwin-arm64": "4.42.0",+ "@rollup/rollup-darwin-x64": "4.42.0",+ "@rollup/rollup-freebsd-arm64": "4.42.0",+ "@rollup/rollup-freebsd-x64": "4.42.0",+ "@rollup/rollup-linux-arm-gnueabihf": "4.42.0",+ "@rollup/rollup-linux-arm-musleabihf": "4.42.0",+ "@rollup/rollup-linux-arm64-gnu": "4.42.0",+ "@rollup/rollup-linux-arm64-musl": "4.42.0",+ "@rollup/rollup-linux-loongarch64-gnu": "4.42.0",+ "@rollup/rollup-linux-powerpc64le-gnu": "4.42.0",+ "@rollup/rollup-linux-riscv64-gnu": "4.42.0",+ "@rollup/rollup-linux-riscv64-musl": "4.42.0",+ "@rollup/rollup-linux-s390x-gnu": "4.42.0",+ "@rollup/rollup-linux-x64-gnu": "4.42.0",+ "@rollup/rollup-linux-x64-musl": "4.42.0",+ "@rollup/rollup-win32-arm64-msvc": "4.42.0",+ "@rollup/rollup-win32-ia32-msvc": "4.42.0",+ "@rollup/rollup-win32-x64-msvc": "4.42.0","fsevents": "~2.3.2"}},@@ -10858,9 +10859,9 @@}},"node_modules/terser": {- "version": "5.40.0",- "resolved": "https://registry.npmjs.org/terser/-/terser-5.40.0.tgz",- "integrity": "sha512-cfeKl/jjwSR5ar7d0FGmave9hFGJT8obyo0z+CrQOylLDbk7X81nPU6vq9VORa5jU30SkDnT2FXjLbR8HLP+xA==",+ "version": "5.41.0",+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.41.0.tgz",+ "integrity": "sha512-H406eLPXpZbAX14+B8psIuvIr8+3c+2hkuYzpMkoE0ij+NdsVATbA78vb8neA/eqrj7rywa2pIkdmWRsXW6wmw==","dev": true,"license": "BSD-2-Clause","dependencies": {