@actual-app/api 6.2.0 → 6.2.1

package/dist/app/bundle.api.js

@@ -23551,7 +23551,8 @@
           \***********************************************/
         /***/ ((module) => {
             (function () {
-                var _global = this;
+                const _global = this;
+                const createBuffer = val => new TextEncoder().encode(val);
                 /**
                  * JS Implementation of MurmurHash2
                  *
@@ -23560,14 +23561,16 @@
                  * @author <a href="mailto:aappleby@gmail.com">Austin Appleby</a>
                  * @see http://sites.google.com/site/murmurhash/
                  *
-                 * @param {string} str ASCII only
+                 * @param {Uint8Array | string} str ASCII only
                  * @param {number} seed Positive integer only
                  * @return {number} 32-bit positive integer hash
                  */
                 function MurmurHashV2(str, seed) {
-                    var l = str.length, h = seed ^ l, i = 0, k;
+                    if (typeof str === 'string')
+                        str = createBuffer(str);
+                    let l = str.length, h = seed ^ l, i = 0, k;
                     while (l >= 4) {
-                        k = str.charCodeAt(i) & 0xff | (str.charCodeAt(++i) & 0xff) << 8 | (str.charCodeAt(++i) & 0xff) << 16 | (str.charCodeAt(++i) & 0xff) << 24;
+                        k = str[i] & 0xff | (str[++i] & 0xff) << 8 | (str[++i] & 0xff) << 16 | (str[++i] & 0xff) << 24;
                         k = (k & 0xffff) * 0x5bd1e995 + (((k >>> 16) * 0x5bd1e995 & 0xffff) << 16);
                         k ^= k >>> 24;
                         k = (k & 0xffff) * 0x5bd1e995 + (((k >>> 16) * 0x5bd1e995 & 0xffff) << 16);
@@ -23577,11 +23580,11 @@
                     }
                     switch (l) {
                         case 3:
-                            h ^= (str.charCodeAt(i + 2) & 0xff) << 16;
+                            h ^= (str[i + 2] & 0xff) << 16;
                         case 2:
-                            h ^= (str.charCodeAt(i + 1) & 0xff) << 8;
+                            h ^= (str[i + 1] & 0xff) << 8;
                         case 1:
-                            h ^= str.charCodeAt(i) & 0xff;
+                            h ^= str[i] & 0xff;
                             h = (h & 0xffff) * 0x5bd1e995 + (((h >>> 16) * 0x5bd1e995 & 0xffff) << 16);
                     }
                     h ^= h >>> 13;
@@ -23590,7 +23593,7 @@
                     return h >>> 0;
                 }
                 ;
-                /**
+                /*
                  * JS Implementation of MurmurHash3 (r136) (as of May 20, 2011)
                  *
                  * @author <a href="mailto:gary.court@gmail.com">Gary Court</a>
@@ -23598,12 +23601,14 @@
                  * @author <a href="mailto:aappleby@gmail.com">Austin Appleby</a>
                  * @see http://sites.google.com/site/murmurhash/
                  *
-                 * @param {string} key ASCII only
+                 * @param {Uint8Array | string} key ASCII only
                  * @param {number} seed Positive integer only
                  * @return {number} 32-bit positive integer hash
                  */
                 function MurmurHashV3(key, seed) {
-                    var remainder, bytes, h1, h1b, c1, c1b, c2, c2b, k1, i;
+                    if (typeof key === 'string')
+                        key = createBuffer(key);
+                    let remainder, bytes, h1, h1b, c1, c1b, c2, c2b, k1, i;
                     remainder = key.length & 3; // key.length % 4
                     bytes = key.length - remainder;
                     h1 = seed;
@@ -23611,7 +23616,7 @@
                     c2 = 0x1b873593;
                     i = 0;
                     while (i < bytes) {
-                        k1 = key.charCodeAt(i) & 0xff | (key.charCodeAt(++i) & 0xff) << 8 | (key.charCodeAt(++i) & 0xff) << 16 | (key.charCodeAt(++i) & 0xff) << 24;
+                        k1 = key[i] & 0xff | (key[++i] & 0xff) << 8 | (key[++i] & 0xff) << 16 | (key[++i] & 0xff) << 24;
                         ++i;
                         k1 = (k1 & 0xffff) * c1 + (((k1 >>> 16) * c1 & 0xffff) << 16) & 0xffffffff;
                         k1 = k1 << 15 | k1 >>> 17;
@@ -23624,11 +23629,11 @@
                     k1 = 0;
                     switch (remainder) {
                         case 3:
-                            k1 ^= (key.charCodeAt(i + 2) & 0xff) << 16;
+                            k1 ^= (key[i + 2] & 0xff) << 16;
                         case 2:
-                            k1 ^= (key.charCodeAt(i + 1) & 0xff) << 8;
+                            k1 ^= (key[i + 1] & 0xff) << 8;
                         case 1:
-                            k1 ^= key.charCodeAt(i) & 0xff;
+                            k1 ^= key[i] & 0xff;
                             k1 = (k1 & 0xffff) * c1 + (((k1 >>> 16) * c1 & 0xffff) << 16) & 0xffffffff;
                             k1 = k1 << 15 | k1 >>> 17;
                             k1 = (k1 & 0xffff) * c2 + (((k1 >>> 16) * c2 & 0xffff) << 16) & 0xffffffff;
@@ -23642,15 +23647,13 @@
                     h1 ^= h1 >>> 16;
                     return h1 >>> 0;
                 }
-                var murmur = MurmurHashV3;
+                const murmur = MurmurHashV3;
                 murmur.v2 = MurmurHashV2;
                 murmur.v3 = MurmurHashV3;
                 if (true) {
                     module.exports = murmur;
                 }
-                else {
-                    var _previousRoot;
-                }
+                else { }
             })();
             /***/ 
         }),
@@ -26022,8 +26025,11 @@
                 };
             }
             exports.emptyTrie = emptyTrie;
+            function isNumberTrieNodeKey(input) {
+                return ['0', '1', '2'].includes(input);
+            }
             function getKeys(trie) {
-                return Object.keys(trie).filter(x => x !== 'hash');
+                return Object.keys(trie).filter(isNumberTrieNodeKey);
             }
             exports.getKeys = getKeys;
             function keyToTimestamp(key) {
@@ -26041,7 +26047,7 @@
                 let hash = timestamp.hash();
                 let key = Number(Math.floor(timestamp.millis() / 1000 / 60)).toString(3);
                 trie = Object.assign({}, trie, {
-                    hash: trie.hash ^ hash
+                    hash: (trie.hash || 0) ^ hash
                 });
                 return insertKey(trie, key, hash);
             }
@@ -26051,10 +26057,11 @@
                     return trie;
                 }
                 const c = key[0];
-                const n = trie[c] || {};
+                const t = isNumberTrieNodeKey(c) ? trie[c] : undefined;
+                const n = t || {};
                 return Object.assign({}, trie, {
                     [c]: Object.assign({}, n, insertKey(n, key.slice(1), hash), {
-                        hash: n.hash ^ hash
+                        hash: (n.hash || 0) ^ hash
                     })
                 });
             }
@@ -26098,11 +26105,11 @@
                     // multiple passes to sync up a trie.
                     for (let i = 0; i < keys.length; i++) {
                         let key = keys[i];
-                        if (!node1[key] || !node2[key]) {
-                            break;
-                        }
                         let next1 = node1[key];
                         let next2 = node2[key];
+                        if (!next1 || !next2) {
+                            break;
+                        }
                         if (next1.hash !== next2.hash) {
                             diffkey = key;
                             break;
@@ -26115,6 +26122,7 @@
                     node1 = node1[diffkey] || emptyTrie();
                     node2 = node2[diffkey] || emptyTrie();
                 }
+                return null;
             }
             exports.diff = diff;
             function prune(trie, n = 2) {
@@ -26129,7 +26137,11 @@
                 };
                 // Prune child nodes.
                 for (let k of keys.slice(-n)) {
-                    next[k] = prune(trie[k], n);
+                    const node = trie[k];
+                    if (!node) {
+                        throw new Error(`TrieNode for key ${k} could not be found`);
+                    }
+                    next[k] = prune(node, n);
                 }
                 return next;
             }
@@ -26137,7 +26149,10 @@
             function debug(trie, k = '', indent = 0) {
                 const str = ' '.repeat(indent) + (k !== '' ? `k: ${k} ` : '') + `hash: ${trie.hash || '(empty)'}\n`;
                 return str + getKeys(trie).map(key => {
-                    return debug(trie[key], key, indent + 2);
+                    const node = trie[key];
+                    if (!node)
+                        return '';
+                    return debug(node, key, indent + 2);
                 }).join('');
             }
             exports.debug = debug;
@@ -26161,7 +26176,7 @@
             const murmurhash_1 = __importDefault(__webpack_require__(/*! murmurhash */ "./node_modules/murmurhash/murmurhash.js"));
             const uuid_1 = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-node/index.js");
             // A mutable global clock
-            let clock = null;
+            let clock;
             function setClock(clock_) {
                 clock = clock_;
             }
@@ -26195,8 +26210,12 @@
                         merkle: {}
                     };
                 }
+                const ts = Timestamp.parse(data.timestamp);
+                if (!ts) {
+                    throw new Timestamp.InvalidError(data.timestamp);
+                }
                 return {
-                    timestamp: MutableTimestamp.from(Timestamp.parse(data.timestamp)),
+                    timestamp: MutableTimestamp.from(ts),
                     merkle: data.merkle
                 };
             }
@@ -26346,10 +26365,12 @@
             /**
              * maximum timestamp
              */
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             Timestamp.max = Timestamp.parse('9999-12-31T23:59:59.999Z-FFFF-FFFFFFFFFFFFFFFF');
             /**
              * zero/minimum timestamp
              */
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             Timestamp.zero = Timestamp.parse('1970-01-01T00:00:00.000Z-0000-0000000000000000');
             Timestamp.since = isoString => isoString + '-0000-0000000000000000';
             /**
@@ -26373,6 +26394,12 @@
                     this.name = 'OverflowError';
                 }
             };
+            Timestamp.InvalidError = class InvalidError extends Error {
+                constructor(...args) {
+                    super(['timestamp is not valid'].concat(args.map(String)).join(' '));
+                    this.name = 'InvalidError';
+                }
+            };
             exports.Timestamp = Timestamp;
             class MutableTimestamp extends Timestamp {
                 static from(timestamp) {
@@ -26495,6 +26522,7 @@
           !*** ./packages/crdt/dist/src/proto/sync_pb.js ***!
           \*************************************************/
         /***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+            "use strict";
             // source: sync.proto
             /**
              * @fileoverview
@@ -35507,40 +35535,37 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 let errors = [];
                 let lowestPriority = 0;
                 let originalCategoryBalance = [];
+                let setToZero = [];
                 let categories = await _db__WEBPACK_IMPORTED_MODULE_3__.all('SELECT * FROM v_categories WHERE tombstone = 0');
                 //clears templated categories
                 for (let c = 0; c < categories.length; c++) {
                     let category = categories[c];
                     let budgeted = await (0, _actions__WEBPACK_IMPORTED_MODULE_6__.getSheetValue)(_shared_months__WEBPACK_IMPORTED_MODULE_0__.sheetForMonth(month), `budget-${category.id}`);
-                    if (budgeted) {
-                        originalCategoryBalance.push({
-                            cat: category,
-                            amount: budgeted,
-                            isIncome: category.is_income
-                        });
-                    }
                     let template = category_templates[category.id];
                     if (template) {
                         for (let l = 0; l < template.length; l++) {
                             lowestPriority = template[l].priority > lowestPriority ? template[l].priority : lowestPriority;
                         }
                     }
-                }
-                await (0, _actions__WEBPACK_IMPORTED_MODULE_6__.setZero)({
-                    month
-                });
-                //setZero() sets budgeted Income to 0. Reset income categories before continuing.
-                if ((0, _actions__WEBPACK_IMPORTED_MODULE_6__.isReflectBudget)()) {
-                    for (let l = 0; l < originalCategoryBalance.length; l++) {
-                        if (originalCategoryBalance[l].isIncome) {
-                            await (0, _actions__WEBPACK_IMPORTED_MODULE_6__.setBudget)({
-                                category: originalCategoryBalance[l].cat.id,
-                                month,
-                                amount: originalCategoryBalance[l].amount
-                            });
-                        }
+                    if (budgeted) {
+                        originalCategoryBalance.push({
+                            category: category.id,
+                            amount: budgeted,
+                            isIncome: category.is_income,
+                            isTemplate: template ? true : false
+                        });
+                        setToZero.push({
+                            category: category.id,
+                            amount: 0,
+                            isIncome: category.is_income,
+                            isTemplate: template ? true : false
+                        });
                     }
                 }
+                await setGoalBudget({
+                    month,
+                    templateBudget: setToZero.filter(f => f.isTemplate === true && f.isIncome === 0)
+                });
                 // find all remainder templates, place them after all other templates
                 let remainder_found;
                 let remainder_priority = lowestPriority + 1;
@@ -35579,7 +35604,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             let skipSchedule = false;
                             let isScheduleOrBy = false;
                             let priorityCheck = 0;
-                            if (template.filter(t => t.type === 'schedule' || t.type === 'by').length > 0) {
+                            if (template.filter(t => (t.type === 'schedule' || t.type === 'by') && t.priority === priority).length > 0) {
+                                template = template.filter(t => t.priority === priority && (t.type !== 'schedule' || t.type !== 'by') || t.type === 'schedule' || t.type === 'by');
                                 let { lowPriority, errorNotice } = await checkScheduleTemplates(template);
                                 priorityCheck = lowPriority;
                                 skipSchedule = priorityCheck !== priority ? true : false;
@@ -35617,17 +35643,18 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     });
                 }
                 if (!force) {
-                    //if overwrite is not preferred, set cell to original value
+                    //if overwrite is not preferred, set cell to original value;
+                    originalCategoryBalance = originalCategoryBalance.filter(c => c.isIncome === 0 && c.isTemplate);
                     for (let l = 0; l < originalCategoryBalance.length; l++) {
                         await (0, _actions__WEBPACK_IMPORTED_MODULE_6__.setBudget)({
-                            category: originalCategoryBalance[l].cat.id,
+                            category: originalCategoryBalance[l].category,
                             month,
                             amount: originalCategoryBalance[l].amount
                         });
                         //if overwrite is not preferred, remove template errors for category
                         let j = errors.length;
                         for (let k = 0; k < j; k++) {
-                            if (errors[k].includes(originalCategoryBalance[l].cat.name)) {
+                            if (errors[k].includes(categories.filter(c => c.id === originalCategoryBalance[l].category)[0].name)) {
                                 errors.splice(k, 1);
                                 j--;
                             }
@@ -35704,6 +35731,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 let errors = [];
                 let all_schedule_names = await _db__WEBPACK_IMPORTED_MODULE_3__.all('SELECT name from schedules WHERE name NOT NULL AND tombstone = 0');
                 all_schedule_names = all_schedule_names.map(v => v.name);
+                let scheduleFlag = false; //only run schedules portion once
                 // remove lines for past dates, calculate repeating dates
                 template_lines = template_lines.filter(template => {
                     switch (template.type) {
@@ -35747,6 +35775,9 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         if (a.type === 'by' && !a.annual) {
                             return _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarMonths(`${a.month}-01`, `${b.month}-01`);
                         }
+                        else if (a.type === 'schedule' || b.type === 'schedule') {
+                            return a.priority - b.priority;
+                        }
                         else {
                             return a.type.localeCompare(b.type);
                         }
@@ -35786,7 +35817,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                                 else {
                                     increment = limit;
                                 }
-                                if (increment < budgetAvailable || !priority) {
+                                if (to_budget + increment < budgetAvailable || !priority) {
                                     to_budget += increment;
                                 }
                                 else {
@@ -35960,61 +35991,123 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                             }
                         case 'schedule':
                             {
-                                let { id: schedule_id } = await _db__WEBPACK_IMPORTED_MODULE_3__.first('SELECT id FROM schedules WHERE name = ?', [template.name]);
-                                let rule = await (0, _schedules_app__WEBPACK_IMPORTED_MODULE_4__.getRuleForSchedule)(schedule_id);
-                                let conditions = rule.serialize().conditions;
-                                let { date: dateCond, amount: amountCond } = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.extractScheduleConds)(conditions);
-                                let next_date_string = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_4__.getNextDate)(dateCond, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month));
-                                let isRepeating = Object(dateCond.value) === dateCond.value && 'frequency' in dateCond.value;
-                                let num_months = _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarMonths(next_date_string, current_month);
-                                if (isRepeating) {
-                                    let monthlyTarget = 0;
-                                    let next_month = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addMonths(current_month, num_months + 1);
-                                    let next_date = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_4__.getNextDate)(dateCond, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month));
-                                    while (next_date < next_month) {
-                                        monthlyTarget += amountCond.value;
-                                        next_date = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addDays(next_date, 1);
-                                        next_date = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_4__.getNextDate)(dateCond, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(next_date));
+                                if (!scheduleFlag) {
+                                    scheduleFlag = true;
+                                    let template = template_lines.filter(t => t.type === 'schedule');
+                                    //in the case of multiple templates per category, schedules may have wrong priority level
+                                    let t = [];
+                                    let totalScheduledGoal = 0;
+                                    for (let ll = 0; ll < template.length; ll++) {
+                                        let { id: sid, completed: complete } = await _db__WEBPACK_IMPORTED_MODULE_3__.first('SELECT * FROM schedules WHERE name = ?', [template[ll].name]);
+                                        console.log(complete);
+                                        let rule = await (0, _schedules_app__WEBPACK_IMPORTED_MODULE_4__.getRuleForSchedule)(sid);
+                                        let conditions = rule.serialize().conditions;
+                                        let { date: dateConditions, amount: amountCondition } = (0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.extractScheduleConds)(conditions);
+                                        let target = -amountCondition.value;
+                                        let next_date_string = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_4__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month));
+                                        let target_interval = dateConditions.value.interval ? dateConditions.value.interval : 1;
+                                        let target_frequency = dateConditions.value.frequency;
+                                        let isRepeating = Object(dateConditions.value) === dateConditions.value && 'frequency' in dateConditions.value;
+                                        let num_months = _shared_months__WEBPACK_IMPORTED_MODULE_0__.differenceInCalendarMonths(next_date_string, current_month);
+                                        t.push({
+                                            template: template[ll],
+                                            target: target,
+                                            next_date_string: next_date_string,
+                                            target_interval: target_interval,
+                                            target_frequency: target_frequency,
+                                            num_months: num_months,
+                                            completed: complete
+                                        });
+                                        if (!complete) {
+                                            if (isRepeating) {
+                                                let monthlyTarget = 0;
+                                                let next_month = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addMonths(current_month, t[ll].num_months + 1);
+                                                let next_date = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_4__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(current_month));
+                                                while (next_date < next_month) {
+                                                    monthlyTarget += amountCondition.value;
+                                                    next_date = _shared_months__WEBPACK_IMPORTED_MODULE_0__.addDays(next_date, 1);
+                                                    next_date = (0, _schedules_app__WEBPACK_IMPORTED_MODULE_4__.getNextDate)(dateConditions, _shared_months__WEBPACK_IMPORTED_MODULE_0__._parse(next_date));
+                                                }
+                                                t[ll].target = -monthlyTarget;
+                                                totalScheduledGoal += target;
+                                            }
+                                        }
+                                        else {
+                                            errors.push(`Schedule ${t[ll].template.name} is a completed schedule.`);
+                                        }
                                     }
-                                    amountCond.value = monthlyTarget;
-                                }
-                                if (template.full === true || (0, _actions__WEBPACK_IMPORTED_MODULE_6__.isReflectBudget)()) {
-                                    if (num_months === 0) {
-                                        to_budget = -(0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.getScheduledAmount)(amountCond.value);
+                                    t = t.filter(t => t.completed === 0);
+                                    t = t.sort((a, b) => b.target - a.target);
+                                    let diff = 0;
+                                    if (balance >= totalScheduledGoal) {
+                                        for (let ll = 0; ll < t.length; ll++) {
+                                            if (t[ll].num_months < 0) {
+                                                errors.push(`Non-repeating schedule ${t[ll].template.name} was due on ${t[ll].next_date_string}, which is in the past.`);
+                                                break;
+                                            }
+                                            if (t[ll].template.full && t[ll].num_months === 0 || t[ll].target_frequency === 'weekly' || t[ll].target_frequency === 'daily') {
+                                                diff += t[ll].target;
+                                            }
+                                            else if (t[ll].template.full && t[ll].num_months > 0) {
+                                                diff += 0;
+                                            }
+                                            else {
+                                                diff += t[ll].target / t[ll].target_interval;
+                                            }
+                                        }
                                     }
-                                    if ((0, _actions__WEBPACK_IMPORTED_MODULE_6__.isReflectBudget)() && !template.full) {
-                                        errors.push(`Report budgets require the full option for Schedules.`);
+                                    else if (balance < totalScheduledGoal) {
+                                        for (let ll = 0; ll < t.length; ll++) {
+                                            if ((0, _actions__WEBPACK_IMPORTED_MODULE_6__.isReflectBudget)()) {
+                                                if (!t[ll].template.full) {
+                                                    errors.push(`Report budgets require the full option for Schedules.`);
+                                                    break;
+                                                }
+                                                if (t[ll].template.full && t[ll].num_months === 0) {
+                                                    to_budget += t[ll].target;
+                                                }
+                                            }
+                                            if (!(0, _actions__WEBPACK_IMPORTED_MODULE_6__.isReflectBudget)()) {
+                                                if (t[ll].num_months < 0) {
+                                                    errors.push(`Non-repeating schedule ${t[ll].template.name} was due on ${t[ll].next_date_string}, which is in the past.`);
+                                                    break;
+                                                }
+                                                if (t[ll].template.full && t[ll].num_months > 0) {
+                                                    remainder = 0;
+                                                }
+                                                else if (ll === 0 && !t[ll].template.full) {
+                                                    remainder = t[ll].target - last_month_balance;
+                                                }
+                                                else {
+                                                    remainder = t[ll].target - remainder;
+                                                }
+                                                let tg = 0;
+                                                if (remainder >= 0) {
+                                                    tg = remainder;
+                                                    remainder = 0;
+                                                }
+                                                else {
+                                                    tg = 0;
+                                                    remainder = Math.abs(remainder);
+                                                }
+                                                if (t[ll].template.full || t[ll].num_months === 0 || t[ll].target_frequency === 'weekly' || t[ll].target_frequency === 'daily') {
+                                                    diff += tg;
+                                                }
+                                                else if (t[ll].template.full && t[ll].num_months > 0) {
+                                                    diff += 0;
+                                                }
+                                                else {
+                                                    diff += tg / (t[ll].num_months + 1);
+                                                }
+                                            }
+                                        }
                                     }
-                                    break;
-                                }
-                                if (l === 0)
-                                    remainder = last_month_balance;
-                                remainder = -(0, _shared_schedules__WEBPACK_IMPORTED_MODULE_1__.getScheduledAmount)(amountCond.value) - remainder;
-                                let target = 0;
-                                if (remainder >= 0) {
-                                    target = remainder;
-                                    remainder = 0;
-                                }
-                                else {
-                                    target = 0;
-                                    remainder = Math.abs(remainder);
-                                }
-                                let diff = num_months >= 0 ? Math.round(target / (num_months + 1)) : 0;
-                                if (num_months < 0) {
-                                    errors.push(`Non-repeating schedule ${template.name} was due on ${next_date_string}, which is in the past.`);
-                                    return {
-                                        errors
-                                    };
-                                }
-                                else if (num_months >= 0) {
-                                    if (diff >= 0 && num_months >= 0 && to_budget + diff < budgetAvailable || !priority) {
+                                    diff = Math.round(diff);
+                                    if (diff > 0 && to_budget + diff <= budgetAvailable || !priority) {
                                         to_budget += diff;
-                                        if (l === template_lines.length - 1)
-                                            to_budget -= spent;
                                     }
-                                    else {
-                                        if (budgetAvailable > 0)
-                                            to_budget = budgetAvailable;
+                                    else if (to_budget + diff > budgetAvailable && budgetAvailable >= 0) {
+                                        to_budget = budgetAvailable;
                                         errors.push(`Insufficient funds.`);
                                     }
                                 }
@@ -36046,8 +36139,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                     if (hold && balance > limit) {
                         to_budget = 0;
                     }
-                    else if (to_budget + last_month_balance > limit) {
-                        to_budget = limit - last_month_balance;
+                    else if (to_budget + balance > limit) {
+                        to_budget = limit - balance;
                     }
                 }
                 if ((category.budgeted != null && category.budgeted !== 0 || to_budget === 0) && !force) {
@@ -38533,10 +38626,13 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                 if (data.data) {
                     data = data.data;
                 }
+                if (data.budget) {
+                    data = data.budget;
+                }
                 return data;
             }
             function getBudgetName(_filepath, data) {
-                return data.budget_name;
+                return data.budget_name || data.name;
             }
             /***/ 
         }),
@@ -40277,7 +40373,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         throw new Error(`File not found at the provided path: ${filepath}`);
                     }
                     let buffer = Buffer.from(await _platform_server_fs__WEBPACK_IMPORTED_MODULE_7__.readFile(filepath, 'binary'));
-                    await (0, _importers__WEBPACK_IMPORTED_MODULE_34__.handleBudgetImport)(type, filepath, buffer);
+                    let results = await (0, _importers__WEBPACK_IMPORTED_MODULE_34__.handleBudgetImport)(type, filepath, buffer);
+                    return results || {};
                 }
                 catch (err) {
                     err.message = 'Error importing budget: ' + err.message;
@@ -40286,7 +40383,6 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
                         error: 'internal-error'
                     };
                 }
-                return {};
             };
             handlers['export-budget'] = async function () {
                 return await _cloud_storage__WEBPACK_IMPORTED_MODULE_28__.exportBuffer();
@@ -41377,7 +41473,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);
             }
             // Methods
             async function checkIfScheduleExists(name, scheduleId) {
-                let idForName = await _db__WEBPACK_IMPORTED_MODULE_11__.first('SELECT id from schedules WHERE name = ?', [name]);
+                let idForName = await _db__WEBPACK_IMPORTED_MODULE_11__.first('SELECT id from schedules WHERE tombstone = 0 AND name = ?', [name]);
                 if (idForName == null) {
                     return false;
                 }

package/dist/migrations/1691233396000_add_schedule_next_date_tombstone.sql

@@ -0,0 +1,5 @@
+BEGIN TRANSACTION;
+
+ALTER TABLE schedules_next_date ADD COLUMN tombstone INTEGER DEFAULT 0;
+
+COMMIT;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "license": "MIT",
   "description": "An API for Actual",
   "main": "dist/index.js",