@actual-app/core 26.5.0 → 26.5.2

package/src/server/accounts/sync.ts

@@ -1,5 +1,6 @@
 // @ts-strict-ignore
 import * as dateFns from 'date-fns';
+import { v4 as uuidv4 } from 'uuid';
 
 import * as asyncStorage from '#platform/server/asyncStorage';
 import { logger } from '#platform/server/log';
@@ -322,7 +323,7 @@ async function resolvePayee(trans, payeeName, payeesToCreate) {
       return payee.id;
     } else {
       // Otherwise we're going to create a new one
-      const newPayee = { id: crypto.randomUUID(), name: payeeName };
+      const newPayee = { id: uuidv4(), name: payeeName };
       payeesToCreate.set(payeeName.toLowerCase(), newPayee);
       return newPayee.id;
     }
@@ -616,7 +617,7 @@ export async function reconcileTransactions(
       const { forceAddTransaction: _forceAddTransaction, ...newTrans } = trans;
       const finalTransaction = {
         ...newTrans,
-        id: crypto.randomUUID(),
+        id: uuidv4(),
         category: trans.category || null,
         cleared: trans.cleared ?? defaultCleared,
       };
@@ -880,7 +881,7 @@ export async function addTransactions(
     const trans = await runRules(originalTrans, accountsMap);
 
     const finalTransaction = {
-      id: crypto.randomUUID(),
+      id: uuidv4(),
       ...trans,
       account: acctId,
       cleared: trans.cleared != null ? trans.cleared : true,

package/src/server/cloud-storage.ts

@@ -1,5 +1,6 @@
 // @ts-strict-ignore
 import AdmZip from 'adm-zip';
+import { v4 as uuidv4 } from 'uuid';
 
 import * as asyncStorage from '#platform/server/asyncStorage';
 import { fetch } from '#platform/server/fetch';
@@ -286,7 +287,7 @@ export async function upload() {
   }
 
   if (!cloudFileId) {
-    cloudFileId = crypto.randomUUID();
+    cloudFileId = uuidv4();
   }
 
   let res;

package/src/server/dashboard/app.ts

@@ -1,4 +1,5 @@
 import isMatch from 'lodash/isMatch';
+import { v4 as uuidv4 } from 'uuid';
 
 import { captureException } from '#platform/exceptions';
 import * as fs from '#platform/server/fs';
@@ -101,7 +102,7 @@ const exportModel = {
 };
 
 async function createDashboardPage({ name }: { name: string }) {
-  const id = crypto.randomUUID();
+  const id = uuidv4();
   await db.insertWithSchema('dashboard_pages', { id, name });
 
   return id;

package/src/server/db/index.ts

@@ -9,6 +9,7 @@ import {
 } from '@actual-app/crdt';
 import type { Database, Statement } from '@jlongster/sql.js';
 import { LRUCache } from 'lru-cache';
+import { v4 as uuidv4 } from 'uuid';
 
 import * as fs from '#platform/server/fs';
 import * as sqlite from '#platform/server/sqlite';
@@ -223,7 +224,7 @@ export async function update(table, params) {
 
 export async function insertWithUUID(table, row) {
   if (!row.id) {
-    row = { ...row, id: crypto.randomUUID() };
+    row = { ...row, id: uuidv4() };
   }
 
   await insert(table, row);
@@ -292,7 +293,7 @@ export function insertWithSchema(table, row) {
   // Even though `insertWithUUID` does this, we need to do it here so
   // the schema validation passes
   if (!row.id) {
-    row = { ...row, id: crypto.randomUUID() };
+    row = { ...row, id: uuidv4() };
   }
 
   return insertWithUUID(

package/src/server/encryption/app.ts

@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from 'uuid';
+
 import * as asyncStorage from '#platform/server/asyncStorage';
 import { logger } from '#platform/server/log';
 import { createApp } from '#server/app';
@@ -28,7 +30,7 @@ async function keyMake({ password }: { password: string }) {
   }
 
   const salt = encryption.randomBytes(32).toString('base64');
-  const id = crypto.randomUUID();
+  const id = uuidv4();
   const key = await encryption.createKey({ id, password, salt });
 
   // Load the key

package/src/server/encryption/index.ts

@@ -1,4 +1,5 @@
 // @ts-strict-ignore
+import { v4 as uuidv4 } from 'uuid';
 
 import * as internals from '#server/encryption/encryption-internals';
 
@@ -11,7 +12,7 @@ class Key {
   value;
 
   constructor({ id }) {
-    this.id = id || crypto.randomUUID();
+    this.id = id || uuidv4();
   }
 
   async createFromPassword({ password, salt }) {

package/src/server/filters/app.ts

@@ -1,4 +1,5 @@
 // @ts-strict-ignore
+import { v4 as uuidv4 } from 'uuid';
 
 import { createApp } from '#server/app';
 import * as db from '#server/db';
@@ -109,7 +110,7 @@ function filterOptionsMatch(options1, options2) {
 }
 
 async function createFilter(filter): Promise<TransactionFilterEntity['id']> {
-  const filterId = crypto.randomUUID();
+  const filterId = uuidv4();
   const item = {
     id: filterId,
     conditions: filter.state.conditions,

package/src/server/importers/ynab4.ts

@@ -1,5 +1,6 @@
 // @ts-strict-ignore
 import AdmZip from 'adm-zip';
+import { v4 as uuidv4 } from 'uuid';
 
 import { logger } from '#platform/server/log';
 import { send } from '#server/main-app';
@@ -164,11 +165,11 @@ async function importTransactions(
   // Go ahead and generate ids for all of the transactions so we can
   // reliably resolve transfers
   for (const transaction of data.transactions) {
-    entityIdMap.set(transaction.entityId, crypto.randomUUID());
+    entityIdMap.set(transaction.entityId, uuidv4());
 
     if (transaction.subTransactions) {
       for (const subTransaction of transaction.subTransactions) {
-        entityIdMap.set(subTransaction.entityId, crypto.randomUUID());
+        entityIdMap.set(subTransaction.entityId, uuidv4());
       }
     }
   }

package/src/server/importers/ynab5.ts

@@ -1,4 +1,5 @@
 // @ts-strict-ignore
+import { v4 as uuidv4 } from 'uuid';
 
 import { logger } from '#platform/server/log';
 import { send } from '#server/main-app';
@@ -599,7 +600,7 @@ async function importTransactions(
   // reliably resolve transfers
   // Also identify orphan transfer transactions and subtransactions.
   for (const transaction of data.subtransactions) {
-    entityIdMap.set(transaction.id, crypto.randomUUID());
+    entityIdMap.set(transaction.id, uuidv4());
 
     if (transaction.transfer_account_id) {
       orphanSubtransfer.push(transaction);
@@ -608,7 +609,7 @@ async function importTransactions(
   }
 
   for (const transaction of data.transactions) {
-    entityIdMap.set(transaction.id, crypto.randomUUID());
+    entityIdMap.set(transaction.id, uuidv4());
 
     if (
       transaction.transfer_account_id &&

package/src/server/reports/app.ts

@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from 'uuid';
+
 import { createApp } from '#server/app';
 import { aqlQuery } from '#server/aql';
 import * as db from '#server/db';
@@ -128,7 +130,7 @@ async function reportNameExists(
 }
 
 async function createReport(report: CustomReportEntity) {
-  const reportId = crypto.randomUUID();
+  const reportId = uuidv4();
   const item: CustomReportEntity = {
     ...report,
     id: reportId,

package/src/server/schedules/app.ts

@@ -1,5 +1,6 @@
 // @ts-strict-ignore
 import * as d from 'date-fns';
+import { v4 as uuidv4 } from 'uuid';
 
 import { captureBreadcrumb } from '#platform/exceptions';
 import * as connection from '#platform/server/connection';
@@ -254,7 +255,7 @@ export async function createSchedule({
   schedule = null,
   conditions = [],
 } = {}): Promise<ScheduleEntity['id']> {
-  const scheduleId = schedule?.id || crypto.randomUUID();
+  const scheduleId = schedule?.id || uuidv4();
 
   const { date: dateCond } = extractScheduleConds(conditions);
   if (dateCond == null) {

package/src/server/schedules/find-schedules.ts

@@ -1,5 +1,6 @@
 // @ts-strict-ignore
 import * as d from 'date-fns';
+import { v4 as uuidv4 } from 'uuid';
 
 import { aqlQuery } from '#server/aql';
 import * as db from '#server/db';
@@ -359,7 +360,7 @@ export async function findSchedules() {
 
       // Convert to schedule and return it
       return {
-        id: crypto.randomUUID(),
+        id: uuidv4(),
         account: winner.account,
         payee: winner.payee,
         date: winner.date,

package/src/server/util/budget-name.ts

@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from 'uuid';
+
 import * as fs from '#platform/server/fs';
 import { handlers } from '#server/main';
 
@@ -37,10 +39,7 @@ export async function validateBudgetName(
 }
 
 export async function idFromBudgetName(name: string): Promise<string> {
-  let id =
-    name.replace(/( |[^A-Za-z0-9])/g, '-') +
-    '-' +
-    crypto.randomUUID().slice(0, 7);
+  let id = name.replace(/( |[^A-Za-z0-9])/g, '-') + '-' + uuidv4().slice(0, 7);
 
   // Make sure the id is unique. There's a chance one could already
   // exist (although very unlikely now that we append unique

package/src/shared/transactions.ts

@@ -1,3 +1,5 @@
+import { v4 as uuidv4 } from 'uuid';
+
 import { logger } from '#platform/server/log';
 import type { TransactionEntity } from '#types/models';
 
@@ -39,7 +41,7 @@ export function makeChild<T extends GenericTransactionEntity>(
     ...data,
     category: 'category' in data ? data.category : parent.category,
     payee: 'payee' in data ? data.payee : parent.payee,
-    id: 'id' in data ? data.id : prefix + crypto.randomUUID(),
+    id: 'id' in data ? data.id : prefix + uuidv4(),
     account: parent.account,
     date: parent.date,
     cleared: parent.cleared != null ? parent.cleared : null,
@@ -357,7 +359,7 @@ export function realizeTempTransactions(
 ): TransactionEntity[] {
   const parent = {
     ...transactions.find(t => !t.is_child),
-    id: crypto.randomUUID(),
+    id: uuidv4(),
     sort_order: Date.now(),
   } as TransactionEntity;
   const children = transactions.filter(t => t.is_child);
@@ -367,7 +369,7 @@ export function realizeTempTransactions(
       child =>
         ({
           ...child,
-          id: crypto.randomUUID(),
+          id: uuidv4(),
           parent_id: parent.id,
         }) satisfies TransactionEntity,
     ),