@actual-app/api 6.8.0 → 6.8.1

package/@types/loot-core/shared/transactions.d.ts

@@ -12,7 +12,7 @@ declare function SplitTransactionError(total: number, parent: TransactionEntity)
     difference: number;
 };
 type GenericTransactionEntity = NewTransactionEntity | TransactionEntity | TransactionEntityWithError;
-export declare function makeChild<T extends GenericTransactionEntity>(parent: T, data: object): T;
+export declare function makeChild<T extends GenericTransactionEntity>(parent: T, data?: object): T;
 export declare function recalculateSplit(trans: TransactionEntity): TransactionEntityWithError;
 export declare function ungroupTransactions(transactions: TransactionEntity[]): TransactionEntity[];
 export declare function groupTransaction(split: TransactionEntity[]): TransactionEntity;
@@ -54,7 +54,7 @@ export declare function deleteTransaction(transactions: TransactionEntity[], id:
     newTransaction: TransactionEntityWithError | TransactionEntity;
     diff: any;
 };
-export declare function splitTransaction(transactions: TransactionEntity[], id: string): {
+export declare function splitTransaction(transactions: TransactionEntity[], id: string, createSubtransactions?: (parentTransaction: TransactionEntity) => TransactionEntity[]): {
     data: any[];
     diff: {
         deleted: any[];

package/@types/loot-core/types/models/reports.d.ts

@@ -79,6 +79,7 @@ export type IntervalEntity = {
   date?: string;
   change?: number;
   intervalStartDate?: string;
+  intervalEndDate?: string;
   totalAssets: number;
   totalDebts: number;
   totalTotals: number;

package/@types/loot-core/types/prefs.d.ts

@@ -5,8 +5,7 @@ export type FeatureFlag =
   | 'goalTemplatesEnabled'
   | 'customReports'
   | 'spendingReport'
-  | 'simpleFinSync'
-  | 'splitsInRules';
+  | 'simpleFinSync';
 
 export type LocalPrefs = Partial<
   {

package/dist/app/bundle.api.js

@@ -26370,18 +26370,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 /* harmony export */ rankRules: () => ( /* binding */rankRules)
                 /* harmony export */ 
             });
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isValid/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
-            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/isValid/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/parseISO/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/subDays/index.js");
+            /* harmony import */ var date_fns__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! date-fns */ "./node_modules/date-fns/esm/addDays/index.js");
             /* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../shared/months */ "./packages/loot-core/src/shared/months.ts");
             /* harmony import */ var _shared_rules__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../../shared/rules */ "./packages/loot-core/src/shared/rules.ts");
             /* harmony import */ var _shared_schedules__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/schedules */ "./packages/loot-core/src/shared/schedules.ts");
             /* harmony import */ var _shared_transactions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../../shared/transactions */ "./packages/loot-core/src/shared/transactions.ts");
             /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.ts");
             /* harmony import */ var _errors__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../errors */ "./packages/loot-core/src/server/errors.ts");
-            /* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../prefs */ "./packages/loot-core/src/server/prefs.ts");
-            /* harmony import */ var _util_rschedule__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../util/rschedule */ "./packages/loot-core/src/server/util/rschedule.ts");
+            /* harmony import */ var _util_rschedule__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ../util/rschedule */ "./packages/loot-core/src/server/util/rschedule.ts");
             // @ts-strict-ignore
             function assert(test, type, msg) {
                 if (!test) {
@@ -26393,7 +26392,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     const rules = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_2__.recurConfigToRSchedule)(desc);
                     return {
                         type: 'recur',
-                        schedule: new _util_rschedule__WEBPACK_IMPORTED_MODULE_7__.Schedule({
+                        schedule: new _util_rschedule__WEBPACK_IMPORTED_MODULE_6__.Schedule({
                             rrules: rules,
                             data: {
                                 skipWeekend: desc.skipWeekend,
@@ -26412,7 +26411,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 10) {
                     // YYYY-MM-DD
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](str))) {
                         return null;
                     }
                     return {
@@ -26422,7 +26421,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 7) {
                     // YYYY-MM
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str + '-01'))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](str + '-01'))) {
                         return null;
                     }
                     return {
@@ -26432,7 +26431,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 }
                 else if (str.length === 4) {
                     // YYYY
-                    if (!date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](str + '-01-01'))) {
+                    if (!date_fns__WEBPACK_IMPORTED_MODULE_7__["default"](date_fns__WEBPACK_IMPORTED_MODULE_8__["default"](str + '-01-01'))) {
                         return null;
                     }
                     return {
@@ -26611,7 +26610,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                     const { schedule } = this.value;
                                     if (this.op === 'isapprox') {
                                         const fieldDate = (0, _shared_months__WEBPACK_IMPORTED_MODULE_0__.parseDate)(fieldValue);
-                                        return schedule.occursBetween(date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](fieldDate, 2), date_fns__WEBPACK_IMPORTED_MODULE_11__["default"](fieldDate, 2));
+                                        return schedule.occursBetween(date_fns__WEBPACK_IMPORTED_MODULE_9__["default"](fieldDate, 2), date_fns__WEBPACK_IMPORTED_MODULE_10__["default"](fieldDate, 2));
                                     }
                                     else {
                                         return schedule.occursOn({
@@ -26797,7 +26796,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 const childActions = actions.filter((action) => action.options?.splitIndex);
                 const totalSplitCount = actions.reduce((prev, cur) => Math.max(prev, cur.options?.splitIndex ?? 0), 0) + 1;
                 let update = execNonSplitActions(parentActions, transaction);
-                if (!_prefs__WEBPACK_IMPORTED_MODULE_6__.getPrefs()?.['flags.splitsInRules'] || totalSplitCount === 1) {
+                if (totalSplitCount === 1) {
+                    // No splits, no need to do anything else.
                     return update;
                 }
                 if (update.is_child) {
@@ -27487,7 +27487,14 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         // matched transaction. See the final pass below for the needed
                         // fields.
                         fuzzyDataset = await _db__WEBPACK_IMPORTED_MODULE_4__.all(`SELECT id, is_parent, date, imported_id, payee, category, notes, reconciled FROM v_transactions
-           WHERE date >= ? AND date <= ? AND amount = ? AND account = ?`, [
+           WHERE
+             -- If both ids are set, and we didn't match earlier then skip dedup
+             ( imported_id IS NULL OR ? IS NULL )
+             -- Look 7 days ahead, 7 days behind
+             AND date >= ? AND date <= ? AND amount = ?
+             AND account = ?
+        `, [
+                            trans.imported_id || null,
                             _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.subDays(trans.date, 7)),
                             _db__WEBPACK_IMPORTED_MODULE_4__.toDateRepr(_shared_months__WEBPACK_IMPORTED_MODULE_1__.addDays(trans.date, 7)),
                             trans.amount || 0,
@@ -36867,6 +36874,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     else if (cat.category_group_id === findIdByName(data.category_groups, 'Credit Card Payments')) {
                         return 'creditCard';
                     }
+                    else if (cat.category_group_id === findIdByName(data.category_groups, 'Income')) {
+                        return 'income';
+                    }
                 }
                 // Can't be done in parallel to have
                 // correct sort order.
@@ -36874,13 +36884,17 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (!group.deleted) {
                         let groupId;
                         // Ignores internal category and credit cards
-                        if (!equalsIgnoreCase(group.name, 'Internal Master Category') && !equalsIgnoreCase(group.name, 'Credit Card Payments')) {
+                        if (!equalsIgnoreCase(group.name, 'Internal Master Category') && !equalsIgnoreCase(group.name, 'Credit Card Payments') && !equalsIgnoreCase(group.name, 'Income')) {
                             groupId = await _actual_app_api_methods__WEBPACK_IMPORTED_MODULE_0__.createCategoryGroup({
                                 name: group.name,
                                 is_income: false
                             });
                             entityIdMap.set(group.id, groupId);
                         }
+                        if (equalsIgnoreCase(group.name, 'Income')) {
+                            groupId = incomeCatId;
+                            entityIdMap.set(group.id, groupId);
+                        }
                         const cats = data.categories.filter((cat) => cat.category_group_id === group.id);
                         for (const cat of cats.reverse()) {
                             if (!cat.deleted) {
@@ -44701,7 +44715,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     difference
                 };
             }
-            function makeChild(parent, data) {
+            function makeChild(parent, data = {}) {
                 const prefix = parent.id === 'temp' ? 'temp' : '';
                 return {
                     amount: 0,
@@ -44920,21 +44934,22 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     }
                 });
             }
-            function splitTransaction(transactions, id) {
+            function splitTransaction(transactions, id, createSubtransactions) {
                 return replaceTransactions(transactions, id, (trans) => {
                     if (trans.is_parent || trans.is_child) {
                         return trans;
                     }
+                    const subtransactions = createSubtransactions?.(trans) || [
+                        makeChild(trans)
+                    ];
                     return {
                         ...trans,
                         is_parent: true,
                         error: num(trans.amount) === 0 ? null : SplitTransactionError(0, trans),
-                        subtransactions: [
-                            makeChild(trans, {
-                                amount: 0,
-                                sort_order: -1
-                            })
-                        ]
+                        subtransactions: subtransactions.map((t) => ({
+                            ...t,
+                            sort_order: t.sort_order || -1
+                        }))
                     };
                 });
             }
@@ -45331,9 +45346,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (amount.startsWith('(') && amount.endsWith(')')) {
                     amount = amount.replace('(', '-').replace(')', '');
                 }
-                //look for a decimal marker, then look for either 5 or 1-2 decimal places.
+                // Look for a decimal marker, then look for either 1-2 or 5-9 decimal places.
                 // This avoids matching against 3 places which may not actually be decimal
-                const m = amount.match(/[.,]([^.,]{5}|[^.,]{1,2})$/);
+                const m = amount.match(/[.,]([^.,]{5,9}|[^.,]{1,2})$/);
                 if (!m || m.index === undefined || m.index === 0) {
                     return safeNumber(parseFloat(extractNumbers(amount)));
                 }

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@actual-app/api",
-    "version": "6.8.0",
+    "version": "6.8.1",
     "license": "MIT",
     "description": "An API for Actual",
     "engines": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "6.8.0",
+  "version": "6.8.1",
   "license": "MIT",
   "description": "An API for Actual",
   "engines": {
@@ -22,7 +22,7 @@
     "clean": "rm -rf dist @types"
   },
   "dependencies": {
-    "@actual-app/crdt": "workspace:^",
+    "@actual-app/crdt": "^2.1.0",
     "better-sqlite3": "^9.6.0",
     "compare-versions": "^6.1.0",
     "node-fetch": "^3.3.2",
@@ -37,4 +37,4 @@
     "tsc-alias": "^1.8.8",
     "typescript": "^5.0.2"
   }
-}
+}