@actual-app/core 26.3.0 → 26.4.0-nightly.20260317

package/package.json

@@ -1,8 +1,15 @@
 {
   "name": "@actual-app/core",
-  "version": "26.3.0",
+  "version": "26.4.0-nightly.20260317",
   "description": "",
   "license": "ISC",
+  "typesVersions": {
+    "*": {
+      "types/*": [
+        "./src/types/*"
+      ]
+    }
+  },
   "imports": {
     "#*": [
       "./src/*.ts",
@@ -67,7 +74,7 @@
     "test": "npm-run-all -cp 'test:*'",
     "test:node": "ENV=node vitest --run",
     "test:web": "ENV=web vitest --run -c vitest.web.config.ts",
-    "typecheck": "tsc -b && tsc-strict"
+    "typecheck": "tsgo -b && tsc-strict"
   },
   "dependencies": {
     "@jlongster/sql.js": "^1.6.7",
@@ -76,7 +83,7 @@
     "@rschedule/json-tools": "^1.5.0",
     "@rschedule/standard-date-adapter": "^1.5.0",
     "absurd-sql": "0.0.54",
-    "adm-zip": "patch:adm-zip@npm%3A0.5.16#~/.yarn/patches/adm-zip-npm-0.5.16-4556fea098.patch",
+    "adm-zip": "^0.5.16",
     "better-sqlite3": "^12.6.2",
     "csv-parse": "^6.1.0",
     "csv-stringify": "^6.6.0",
@@ -88,13 +95,12 @@
     "mitt": "^3.0.1",
     "promise-retry": "^2.0.1",
     "slash": "5.1.0",
-    "typescript": "^5.9.3",
     "typescript-strict-plugin": "^2.4.4",
     "ua-parser-js": "^2.0.9",
     "uuid": "^13.0.0"
   },
   "devDependencies": {
-    "@actual-app/crdt": "workspace:*",
+    "@actual-app/crdt": "2.1.0",
     "@swc/core": "^1.15.11",
     "@types/adm-zip": "^0.5.7",
     "@types/better-sqlite3": "^7.6.13",
@@ -102,10 +108,12 @@
     "@types/jlongster__sql.js": "npm:@types/sql.js@latest",
     "@types/node": "^22.19.10",
     "@types/pegjs": "^0.10.6",
+    "@typescript/native-preview": "^7.0.0-dev.20260309.1",
     "assert": "^2.1.0",
     "browserify-zlib": "^0.2.0",
     "buffer": "^6.0.3",
     "cross-env": "^10.1.0",
+    "crypto-browserify": "^3.12.1",
     "fake-indexeddb": "^6.2.5",
     "fast-check": "4.5.3",
     "i18next": "^25.8.4",
@@ -117,12 +125,13 @@
     "peggy": "5.0.6",
     "rollup-plugin-visualizer": "^6.0.5",
     "stream-browserify": "^3.0.0",
+    "timers-browserify": "^2.0.12",
     "ts-node": "^10.9.2",
-    "typescript": "^5.9.3",
-    "vite": "^7.3.1",
+    "util": "^0.12.5",
+    "vite": "^8.0.0",
     "vite-plugin-node-polyfills": "^0.25.0",
     "vite-plugin-peggy-loader": "^2.0.1",
-    "vitest": "^4.0.18",
+    "vitest": "^4.1.0",
     "yargs": "^18.0.0"
   }
-}
+}

package/src/server/accounts/sync.ts

@@ -22,6 +22,7 @@ import type {
 } from '../../types/models';
 import { aqlQuery } from '../aql';
 import * as db from '../db';
+import { TRANSACTION_SORT_INCREMENT } from '../db/sort';
 import { runMutator } from '../mutators';
 import { post } from '../post';
 import { getServer } from '../server-config';
@@ -633,7 +634,7 @@ export async function reconcileTransactions(
   // Maintain the sort order of the server
   const now = Date.now();
   added.forEach((t, index) => {
-    t.sort_order ??= now - index;
+    t.sort_order ??= now - index * TRANSACTION_SORT_INCREMENT;
   });
 
   if (!isPreview) {
@@ -897,6 +898,14 @@ export async function addTransactions(
 
   await createNewPayees(payeesToCreate, added);
 
+  // Assign decreasing sort_order values to preserve import file order.
+  // Transactions are displayed in sort_order DESC order, so first transaction
+  // in the file should have the highest sort_order.
+  const now = Date.now();
+  added.forEach((t, index) => {
+    t.sort_order ??= now - index * TRANSACTION_SORT_INCREMENT;
+  });
+
   let newTransactions;
   if (runTransfers || learnCategories) {
     const res = await batchUpdateTransactions({

package/src/server/db/index.ts

@@ -33,7 +33,12 @@ import {
 } from '../models';
 import { batchMessages, sendMessages } from '../sync';
 
-import { shoveSortOrders, SORT_INCREMENT } from './sort';
+import {
+  shoveSortOrders,
+  shoveSortOrdersDescending,
+  SORT_INCREMENT,
+  TRANSACTION_SORT_INCREMENT,
+} from './sort';
 import type {
   DbAccount,
   DbBank,
@@ -810,6 +815,142 @@ export async function deleteTransaction(transaction) {
   return delete_('transactions', transaction.id);
 }
 
+/**
+ * Move a transaction to a new position within the same date.
+ * Uses the same midpoint/shove algorithm as category reordering.
+ *
+ * @param id - The ID of the transaction to move
+ * @param accountId - The account the transaction belongs to
+ * @param targetId - The ID of the transaction to place AFTER, or null to place at top
+ */
+export async function moveTransaction(
+  id: string,
+  accountId: string,
+  targetId: string | null,
+) {
+  await batchMessages(async () => {
+    const transaction = await getTransaction(id);
+    if (!transaction) {
+      throw new Error(`Transaction not found: ${id}`);
+    }
+
+    // Validate that the transaction belongs to the specified account
+    if (transaction.account !== accountId) {
+      throw new Error(
+        `Transaction ${id} does not belong to account ${accountId}`,
+      );
+    }
+
+    // Convert date string (YYYY-MM-DD) to integer format (YYYYMMDD) for SQL query
+    const dateInt = parseInt(transaction.date.replace(/-/g, ''), 10);
+
+    // Get transactions to reorder against.
+    // If this is a child transaction, scope to siblings with the same parent_id.
+    // Otherwise, get all parent transactions for the same date (excluding children).
+    // Query in DESC order to match UI display order.
+    const isChild = transaction.is_child && transaction.parent_id;
+    const transactions = await all<{ id: string; sort_order: number }>(
+      isChild
+        ? `SELECT vt.id, vt.sort_order
+           FROM v_transactions vt
+           WHERE vt.parent_id = ?
+           ORDER BY sort_order DESC, id`
+        : `SELECT vt.id, vt.sort_order
+           FROM v_transactions vt
+           WHERE vt.account = ?
+             AND vt.date = ?
+             AND vt.is_child = 0
+           ORDER BY sort_order DESC, id`,
+      isChild ? [transaction.parent_id] : [accountId, dateInt],
+    );
+
+    // Calculate new sort_order using the descending shove algorithm
+    // - If targetId is null, place at TOP (highest sort_order)
+    // - Otherwise, place AFTER target (sort_order between target and next)
+    const { sort_order: newSortOrder, updates } = shoveSortOrdersDescending(
+      transactions,
+      targetId,
+      id,
+      TRANSACTION_SORT_INCREMENT,
+    );
+
+    // Apply updates to shuffle other transactions if needed
+    for (const info of updates) {
+      await update('transactions', info);
+      // Only move subtransactions for parent transactions
+      if (!isChild) {
+        await moveSubtransactions(info.id, info.sort_order, accountId, dateInt);
+      }
+    }
+
+    // Update the moved transaction
+    await update('transactions', { id, sort_order: newSortOrder });
+    // Only move subtransactions for parent transactions
+    if (!isChild) {
+      await moveSubtransactions(id, newSortOrder, accountId, dateInt);
+    }
+  });
+}
+
+/**
+ * Update sort_order of child/subtransactions to maintain relative ordering.
+ * Children are distributed evenly between the parent's sort_order and the
+ * next sibling's sort_order to avoid collisions.
+ *
+ * This ensures split transaction children move with their parent.
+ *
+ * @param parentId - The ID of the parent transaction
+ * @param parentSortOrder - The sort_order of the parent transaction
+ * @param accountId - The account ID to scope the next sibling lookup
+ * @param txnDate - The transaction date (as integer YYYYMMDD) to scope the next sibling lookup
+ */
+async function moveSubtransactions(
+  parentId: string,
+  parentSortOrder: number,
+  accountId: string,
+  txnDate: number,
+) {
+  const subtransactions = await all<{ id: string }>(
+    'SELECT id FROM v_transactions WHERE parent_id = ? ORDER BY sort_order DESC',
+    [parentId],
+  );
+
+  if (subtransactions.length === 0) {
+    return;
+  }
+
+  // Find the next sibling's sort_order (transaction with lower sort_order that isn't a child)
+  // Scoped to the same account and date to avoid picking transactions from other contexts
+  const nextSibling = await first<{ sort_order: number }>(
+    `SELECT sort_order FROM v_transactions
+     WHERE parent_id IS NULL
+       AND is_child = 0
+       AND sort_order < ?
+       AND account = ?
+       AND date = ?
+     ORDER BY sort_order DESC
+     LIMIT 1`,
+    [parentSortOrder, accountId, txnDate],
+  );
+
+  // Calculate the available gap for distributing children
+  // Use a sensible fallback if no next sibling exists
+  const nextSiblingSortOrder =
+    nextSibling?.sort_order ?? parentSortOrder - TRANSACTION_SORT_INCREMENT;
+  const gap = parentSortOrder - nextSiblingSortOrder;
+
+  // Distribute children evenly within the gap
+  // Avoid rounding to prevent duplicate sort_order values in tight gaps
+  for (const [index, sub] of subtransactions.entries()) {
+    const newSortOrder =
+      parentSortOrder - ((index + 1) * gap) / (subtransactions.length + 1);
+    await update('transactions', {
+      id: sub.id,
+      sort_order: newSortOrder,
+    });
+  }
+}
+
 function toSqlQueryParameters(params: unknown[]) {
   return params.map(() => '?').join(',');
 }

package/src/server/db/sort.ts

@@ -1,13 +1,21 @@
 export const SORT_INCREMENT = 16384;
 
-function midpoint<T extends { sort_order: number }>(items: T[], to: number) {
+// Smaller increment for transactions - allows more reordering within a date
+// before needing to resequence. Used by moveTransaction().
+export const TRANSACTION_SORT_INCREMENT = 1024;
+
+function midpoint<T extends { sort_order: number }>(
+  items: T[],
+  to: number,
+  sortIncrement: number = SORT_INCREMENT,
+) {
   const below = items[to - 1];
   const above = items[to];
 
   if (!below) {
     return above.sort_order / 2;
   } else if (!above) {
-    return below.sort_order + SORT_INCREMENT;
+    return below.sort_order + sortIncrement;
   } else {
     return (below.sort_order + above.sort_order) / 2;
   }
@@ -16,6 +24,7 @@ function midpoint<T extends { sort_order: number }>(items: T[], to: number) {
 export function shoveSortOrders<T extends { id: string; sort_order: number }>(
   items: T[],
   targetId: string | null = null,
+  sortIncrement: number = SORT_INCREMENT,
 ) {
   const to = items.findIndex(item => item.id === targetId);
   const target = items[to];
@@ -27,17 +36,17 @@ export function shoveSortOrders<T extends { id: string; sort_order: number }>(
     let order;
     if (items.length > 0) {
       // Add a new increment to whatever is the latest sort order
-      order = items[items.length - 1].sort_order + SORT_INCREMENT;
+      order = items[items.length - 1].sort_order + sortIncrement;
     } else {
       // If no items exist, the default is to use the first increment
-      order = SORT_INCREMENT;
+      order = sortIncrement;
     }
 
     return { updates, sort_order: order };
   } else {
     if (target.sort_order - (before ? before.sort_order : 0) <= 2) {
       let next = to;
-      let order = Math.floor(items[next].sort_order) + SORT_INCREMENT;
+      let order = Math.floor(items[next].sort_order) + sortIncrement;
       while (next < items.length) {
         // No need to update it if it's already greater than the current
         // order. This can happen because there may already be large
@@ -49,10 +58,132 @@ export function shoveSortOrders<T extends { id: string; sort_order: number }>(
         updates.push({ id: items[next].id, sort_order: order });
 
         next++;
-        order += SORT_INCREMENT;
+        order += sortIncrement;
       }
     }
 
-    return { updates, sort_order: midpoint(items, to) };
+    return { updates, sort_order: midpoint(items, to, sortIncrement) };
+  }
+}
+
+/**
+ * Midpoint calculation for descending-ordered lists.
+ * Places the new item between the target and the next item (lower sort_order).
+ *
+ * @param items - Array of items sorted by sort_order descending
+ * @param targetIdx - Index of the target item
+ * @param sortIncrement - The increment to use when no next item exists
+ * @param nextIdx - Optional index of the next item (to skip movingId)
+ */
+function midpointDescending<T extends { sort_order: number }>(
+  items: T[],
+  targetIdx: number,
+  sortIncrement: number = SORT_INCREMENT,
+  nextIdx: number | null = null,
+): number {
+  const target = items[targetIdx];
+  const next = nextIdx === null ? items[targetIdx + 1] : items[nextIdx];
+
+  if (!next) {
+    // Target is at the bottom - place below it
+    return target.sort_order - sortIncrement;
+  } else {
+    // Use midpoint between target and next
+    return Math.round((target.sort_order + next.sort_order) / 2);
+  }
+}
+
+/**
+ * Calculate sort_order for placing an item after a target in a descending-ordered list.
+ * Mirrors shoveSortOrders but for lists sorted by sort_order DESC (higher values first).
+ *
+ * Use this when:
+ * - Items are displayed with highest sort_order at top
+ * - You want to place an item AFTER the target (visually below it)
+ * - Items need to be shoved DOWN (decreased sort_order) to make room
+ *
+ * @param items - Array of items sorted by sort_order descending
+ * @param targetId - ID of the item to place after, or null to place at top
+ * @param movingId - ID of the item being moved (skipped when shoving)
+ * @param sortIncrement - The increment to use when shoving items
+ * @returns Object with sort_order for the new position and updates array for shoved items
+ */
+export function shoveSortOrdersDescending<
+  T extends { id: string; sort_order: number },
+>(
+  items: T[],
+  targetId: string | null = null,
+  movingId: string | null = null,
+  sortIncrement: number = SORT_INCREMENT,
+): {
+  sort_order: number;
+  updates: Array<{ id: string; sort_order: number }>;
+} {
+  const updates: Array<{ id: string; sort_order: number }> = [];
+
+  // If no target is specified, place at the top (highest sort_order)
+  if (!targetId) {
+    let order;
+    if (items.length > 0) {
+      order = items[0].sort_order + sortIncrement;
+    } else {
+      order = sortIncrement;
+    }
+    return { updates, sort_order: order };
+  }
+
+  const targetIdx = items.findIndex(item => item.id === targetId);
+
+  // Target not found, place at end (lowest sort_order)
+  if (targetIdx === -1) {
+    const order =
+      items.length > 0
+        ? items[items.length - 1].sort_order - sortIncrement
+        : sortIncrement;
+    return { updates, sort_order: order };
   }
+
+  const target = items[targetIdx];
+  // Find the next item, skipping the moving item to avoid computing gap against itself
+  const nextIdx = items.findIndex(
+    (item, idx) => idx > targetIdx && (!movingId || item.id !== movingId),
+  );
+  const next = nextIdx === -1 ? null : items[nextIdx];
+
+  // Check if there's room between target and next item
+  const gap = target.sort_order - (next ? next.sort_order : 0);
+  if (gap > 2) {
+    // There's room - use midpoint
+    // When nextIdx === -1, there's no next item (excluding the moving item),
+    // so place directly below target instead of calling midpointDescending
+    // which would incorrectly use items[targetIdx + 1] (the moving item itself)
+    const newSortOrder =
+      nextIdx === -1
+        ? target.sort_order - sortIncrement
+        : midpointDescending(items, targetIdx, sortIncrement, nextIdx);
+    return {
+      updates,
+      sort_order: newSortOrder,
+    };
+  }
+
+  // Need to shove items down (decrease sort_order) to make room
+  let newOrder = target.sort_order - sortIncrement;
+  for (let i = targetIdx + 1; i < items.length; i++) {
+    // Skip the item being moved
+    if (movingId && items[i].id === movingId) continue;
+
+    // Only update if we need to make room
+    if (items[i].sort_order >= newOrder) {
+      updates.push({ id: items[i].id, sort_order: newOrder });
+      newOrder = newOrder - sortIncrement;
+    } else {
+      break;
+    }
+  }
+
+  return {
+    updates,
+    sort_order: Math.round(target.sort_order - sortIncrement / 2),
+  };
 }

package/src/server/transactions/app.ts

@@ -8,6 +8,7 @@ import type {
 } from '../../types/models';
 import { createApp } from '../app';
 import { aqlQuery } from '../aql';
+import * as db from '../db';
 import { mutator } from '../mutators';
 import { undoable } from '../undo';
 
@@ -23,6 +24,7 @@ export type TransactionHandlers = {
   'transaction-add': typeof addTransaction;
   'transaction-update': typeof updateTransaction;
   'transaction-delete': typeof deleteTransaction;
+  'transaction-move': typeof moveTransaction;
   'transactions-parse-file': typeof parseTransactionsFile;
   'transactions-export': typeof exportTransactions;
   'transactions-export-query': typeof exportTransactionsQuery;
@@ -64,6 +66,36 @@ async function deleteTransaction(transaction: Pick<TransactionEntity, 'id'>) {
   return {};
 }
 
+async function moveTransaction({
+  id,
+  accountId,
+  targetId,
+}: {
+  id: string;
+  accountId: string;
+  targetId: string | null;
+}) {
+  // Fetch the transaction to validate it exists and verify account
+  const transaction = await db.getTransaction(id);
+  if (!transaction) {
+    throw new Error(`Transaction not found: ${id}`);
+  }
+
+  // Validate that the provided accountId matches the transaction's actual account
+  // This prevents sort order calculations against the wrong account
+  if (transaction.account !== accountId) {
+    throw new Error(
+      `Account mismatch: transaction belongs to account ${transaction.account}, not ${accountId}`,
+    );
+  }
+
+  // Child transactions can be reordered within their parent's children
+  // The db.moveTransaction handles the sibling-scoped reordering for children
+
+  await db.moveTransaction(id, accountId, targetId);
+  return {};
+}
+
 async function parseTransactionsFile({
   filepath,
   options,
@@ -129,6 +161,7 @@ app.method('transactions-merge', mutator(undoable(mergeTransactions)));
 app.method('transaction-add', mutator(addTransaction));
 app.method('transaction-update', mutator(updateTransaction));
 app.method('transaction-delete', mutator(deleteTransaction));
+app.method('transaction-move', mutator(undoable(moveTransaction)));
 app.method('transactions-parse-file', mutator(parseTransactionsFile));
 app.method('transactions-export', mutator(exportTransactions));
 app.method('transactions-export-query', mutator(exportTransactionsQuery));

package/src/server/transactions/import/__snapshots__/parse-file.test.ts.snap

@@ -52,7 +52,7 @@ exports[`File import > CAMT.053 import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456788,
+    "sort_order": 123455765,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -78,7 +78,7 @@ exports[`File import > CAMT.053 import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456787,
+    "sort_order": 123454741,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -107,7 +107,7 @@ exports[`File import > CAMT.053 import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456786,
+    "sort_order": 123453717,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -133,7 +133,7 @@ exports[`File import > CAMT.053 import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456785,
+    "sort_order": 123452693,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -159,7 +159,7 @@ exports[`File import > CAMT.053 import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456784,
+    "sort_order": 123451669,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -185,7 +185,7 @@ exports[`File import > CAMT.053 import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456783,
+    "sort_order": 123450645,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -242,7 +242,7 @@ exports[`File import > handles html escaped plaintext 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456788,
+    "sort_order": 123455765,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -330,7 +330,7 @@ exports[`File import > import notes are respected when importing > transactions
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456788,
+    "sort_order": 123455765,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -356,7 +356,7 @@ exports[`File import > import notes are respected when importing > transactions
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456787,
+    "sort_order": 123454741,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -382,7 +382,7 @@ exports[`File import > import notes are respected when importing > transactions
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456786,
+    "sort_order": 123453717,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -408,7 +408,7 @@ exports[`File import > import notes are respected when importing > transactions
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456785,
+    "sort_order": 123452693,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -434,7 +434,7 @@ exports[`File import > import notes are respected when importing > transactions
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456784,
+    "sort_order": 123451669,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -460,7 +460,7 @@ exports[`File import > import notes are respected when importing > transactions
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456783,
+    "sort_order": 123450645,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -486,7 +486,7 @@ exports[`File import > import notes are respected when importing > transactions
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456782,
+    "sort_order": 123449621,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -512,7 +512,7 @@ exports[`File import > import notes are respected when importing > transactions
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456781,
+    "sort_order": 123448597,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -538,7 +538,7 @@ exports[`File import > import notes are respected when importing > transactions
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456780,
+    "sort_order": 123447573,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -626,7 +626,7 @@ exports[`File import > ofx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456788,
+    "sort_order": 123455765,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -652,7 +652,7 @@ exports[`File import > ofx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456787,
+    "sort_order": 123454741,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -678,7 +678,7 @@ exports[`File import > ofx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456786,
+    "sort_order": 123453717,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -704,7 +704,7 @@ exports[`File import > ofx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456785,
+    "sort_order": 123452693,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -730,7 +730,7 @@ exports[`File import > ofx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456784,
+    "sort_order": 123451669,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -756,7 +756,7 @@ exports[`File import > ofx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456783,
+    "sort_order": 123450645,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -782,7 +782,7 @@ exports[`File import > ofx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456782,
+    "sort_order": 123449621,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -808,7 +808,7 @@ exports[`File import > ofx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456781,
+    "sort_order": 123448597,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -834,7 +834,7 @@ exports[`File import > ofx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456780,
+    "sort_order": 123447573,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -891,7 +891,7 @@ exports[`File import > qfx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456788,
+    "sort_order": 123455765,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -917,7 +917,7 @@ exports[`File import > qfx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456787,
+    "sort_order": 123454741,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -943,7 +943,7 @@ exports[`File import > qfx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456786,
+    "sort_order": 123453717,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -969,7 +969,7 @@ exports[`File import > qfx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456785,
+    "sort_order": 123452693,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -995,7 +995,7 @@ exports[`File import > qfx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456784,
+    "sort_order": 123451669,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1021,7 +1021,7 @@ exports[`File import > qfx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456783,
+    "sort_order": 123450645,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1047,7 +1047,7 @@ exports[`File import > qfx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456782,
+    "sort_order": 123449621,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1073,7 +1073,7 @@ exports[`File import > qfx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456781,
+    "sort_order": 123448597,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1099,7 +1099,7 @@ exports[`File import > qfx import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456780,
+    "sort_order": 123447573,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1156,7 +1156,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456788,
+    "sort_order": 123455765,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1182,7 +1182,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456787,
+    "sort_order": 123454741,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1208,7 +1208,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456786,
+    "sort_order": 123453717,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1234,7 +1234,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456785,
+    "sort_order": 123452693,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1260,7 +1260,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456784,
+    "sort_order": 123451669,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1286,7 +1286,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456783,
+    "sort_order": 123450645,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1312,7 +1312,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456782,
+    "sort_order": 123449621,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1338,7 +1338,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456781,
+    "sort_order": 123448597,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1364,7 +1364,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456780,
+    "sort_order": 123447573,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1390,7 +1390,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456779,
+    "sort_order": 123446549,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1416,7 +1416,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456778,
+    "sort_order": 123445525,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1442,7 +1442,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456777,
+    "sort_order": 123444501,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1468,7 +1468,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456776,
+    "sort_order": 123443477,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1494,7 +1494,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456775,
+    "sort_order": 123442453,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1520,7 +1520,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456774,
+    "sort_order": 123441429,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1546,7 +1546,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456773,
+    "sort_order": 123440405,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,
@@ -1572,7 +1572,7 @@ exports[`File import > qif import works 1`] = `
     "raw_synced_data": null,
     "reconciled": 0,
     "schedule": null,
-    "sort_order": 123456772,
+    "sort_order": 123439381,
     "starting_balance_flag": 0,
     "tombstone": 0,
     "transferred_id": null,

package/src/shared/environment.ts

@@ -11,7 +11,10 @@ export function isNonProductionEnvironment() {
 }
 
 export function isElectron() {
-  if (navigator.userAgent.indexOf('Electron') >= 0) {
+  if (
+    typeof navigator !== 'undefined' &&
+    navigator.userAgent.indexOf('Electron') >= 0
+  ) {
     return true;
   }
   return false;

package/src/shared/platform.api.ts

@@ -0,0 +1,7 @@
+export const isPlaywright = false;
+
+export const OS: 'windows' | 'mac' | 'linux' | 'unknown' = 'unknown';
+export const env: 'web' | 'mobile' | 'unknown' = 'unknown';
+export const isBrowser: boolean = false;
+
+export const isIOSAgent = false;

package/src/shared/transactions.ts

@@ -50,6 +50,8 @@ export function makeChild<T extends GenericTransactionEntity>(
       parent.starting_balance_flag != null
         ? parent.starting_balance_flag
         : null,
+    sort_order:
+      'sort_order' in data ? data.sort_order : (parent.sort_order ?? null),
     is_child: true,
     parent_id: parent.id,
     error: null,
@@ -65,7 +67,7 @@ function makeNonChild<T extends GenericTransactionEntity>(
     ...data,
     cleared: parent.cleared != null ? parent.cleared : null,
     reconciled: parent.reconciled != null ? parent.reconciled : null,
-    sort_order: parent.sort_order || null,
+    sort_order: parent.sort_order ?? null,
     starting_balance_flag: null,
     is_child: false,
     parent_id: null,

package/tsconfig.json

@@ -4,6 +4,7 @@
     "composite": true,
     "noEmit": false,
     "declaration": true,
+    "strict": false, // TODO: fix issues and remove this
     "declarationMap": true,
     "emitDeclarationOnly": true,
     "outDir": "lib-dist/decl",

package/vite.config.ts

@@ -9,7 +9,6 @@ import peggyLoader from 'vite-plugin-peggy-loader';
 export default defineConfig(({ mode }) => {
   const isDev = mode === 'development';
   const outDir = path.resolve(__dirname, 'lib-dist/browser');
-  const crdtDir = path.resolve(__dirname, '../crdt');
 
   return {
     mode,
@@ -25,7 +24,7 @@ export default defineConfig(({ mode }) => {
         fileName: () =>
           isDev ? 'kcab.worker.dev.js' : `kcab.worker.[hash].js`,
       },
-      rollupOptions: {
+      rolldownOptions: {
         onwarn(warning, warn) {
           // Suppress sourcemap warnings from peggy-loader
           if (
@@ -62,12 +61,6 @@ export default defineConfig(({ mode }) => {
     },
     resolve: {
       extensions: ['.js', '.ts', '.tsx', '.json'],
-      alias: [
-        {
-          find: /^@actual-app\/crdt(\/.*)?$/,
-          replacement: path.resolve(crdtDir, 'src') + '$1',
-        },
-      ],
     },
     define: {
       'process.env': '{}',
@@ -83,6 +76,9 @@ export default defineConfig(({ mode }) => {
           'process',
           'stream',
           'path',
+          'crypto',
+          'timers',
+          'util',
           'zlib',
           'fs',
           'assert',
@@ -100,8 +96,11 @@ export default defineConfig(({ mode }) => {
         'buffer',
         'process',
         'assert',
+        'crypto-browserify',
         'path-browserify',
         'stream-browserify',
+        'timers-browserify',
+        'util',
         'browserify-zlib',
       ],
     },

package/vite.desktop.config.ts

@@ -6,7 +6,6 @@ import peggyLoader from 'vite-plugin-peggy-loader';
 
 export default defineConfig(({ mode }) => {
   const outDir = path.resolve(__dirname, 'lib-dist/electron');
-  const crdtDir = path.resolve(__dirname, '../crdt');
 
   return {
     mode,
@@ -21,7 +20,7 @@ export default defineConfig(({ mode }) => {
         formats: ['cjs'],
       },
       sourcemap: true,
-      rollupOptions: {
+      rolldownOptions: {
         output: {
           entryFileNames: 'bundle.desktop.js',
           format: 'cjs',
@@ -45,10 +44,6 @@ export default defineConfig(({ mode }) => {
           find: 'handlebars',
           replacement: require.resolve('handlebars/dist/handlebars.js'),
         },
-        {
-          find: /^@actual-app\/crdt(\/.*)?$/,
-          replacement: path.resolve(crdtDir, 'src') + '$1',
-        },
       ],
     },
     plugins: [

package/vitest.config.ts

@@ -31,12 +31,6 @@ export default defineConfig({
     maxWorkers: 2,
   },
   resolve: {
-    alias: [
-      {
-        find: /^@actual-app\/crdt(\/.*)?$/,
-        replacement: path.resolve(path.join(__dirname, '../crdt/src$1')),
-      },
-    ],
     extensions: resolveExtensions,
   },
   plugins: [peggyLoader()],

package/vitest.web.config.ts

@@ -26,12 +26,6 @@ export default defineConfig({
     maxWorkers: 2,
   },
   resolve: {
-    alias: [
-      {
-        find: /^@actual-app\/crdt(\/.*)?$/,
-        replacement: path.resolve('../../../crdt/src$1'),
-      },
-    ],
     extensions: resolveExtensions,
   },
   plugins: [peggyLoader()],