@actual-app/api 4.1.6 → 5.0.0

package/app/bundle.api.js

@@ -39849,6 +39849,15 @@ async function loadBudget(budgetId) {
   });
 }
 
+async function downloadBudget(syncId, {
+  password
+} = {}) {
+  return send('api/download-budget', {
+    syncId,
+    password
+  });
+}
+
 async function batchBudgetUpdates(func) {
   await send('api/batch-budget-start');
 
@@ -40077,6 +40086,7 @@ module.exports = {
   runQuery,
   q,
   loadBudget,
+  downloadBudget,
   batchBudgetUpdates,
   getBudgetMonths,
   getBudgetMonth,
@@ -42644,7 +42654,7 @@ async function parseOFX(filepath) {
 
   await initModule();
   let errors = [];
-  let contents = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_1___default.a.readFile(filepath);
+  let contents = await _platform_server_fs__WEBPACK_IMPORTED_MODULE_1___default.a.readFile(filepath, 'binary');
   let data;
 
   try {
@@ -45709,20 +45719,21 @@ const payeeRuleModel = _objectSpread(_objectSpread({}, _models__WEBPACK_IMPORTED
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../shared/months */ "./packages/loot-core/src/shared/months.js");
-/* harmony import */ var _shared_query__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../shared/query */ "./packages/loot-core/src/shared/query.js");
-/* harmony import */ var _shared_transactions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../shared/transactions */ "./packages/loot-core/src/shared/transactions.js");
-/* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../shared/util */ "./packages/loot-core/src/shared/util.js");
-/* harmony import */ var _accounts_sync__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./accounts/sync */ "./packages/loot-core/src/server/accounts/sync.js");
-/* harmony import */ var _api_models__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./api-models */ "./packages/loot-core/src/server/api-models.js");
-/* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./aql */ "./packages/loot-core/src/server/aql/index.js");
-/* harmony import */ var _cloud_storage__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./cloud-storage */ "./packages/loot-core/src/server/cloud-storage.js");
-/* harmony import */ var _crdt__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./crdt */ "./packages/loot-core/src/server/crdt/index.js");
-/* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./db */ "./packages/loot-core/src/server/db/index.js");
-/* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./mutators */ "./packages/loot-core/src/server/mutators.js");
-/* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.js");
-/* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.js");
-/* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.js");
+/* harmony import */ var _shared_errors__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../shared/errors */ "./packages/loot-core/src/shared/errors.js");
+/* harmony import */ var _shared_months__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../shared/months */ "./packages/loot-core/src/shared/months.js");
+/* harmony import */ var _shared_query__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../shared/query */ "./packages/loot-core/src/shared/query.js");
+/* harmony import */ var _shared_transactions__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../shared/transactions */ "./packages/loot-core/src/shared/transactions.js");
+/* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../shared/util */ "./packages/loot-core/src/shared/util.js");
+/* harmony import */ var _accounts_sync__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./accounts/sync */ "./packages/loot-core/src/server/accounts/sync.js");
+/* harmony import */ var _api_models__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./api-models */ "./packages/loot-core/src/server/api-models.js");
+/* harmony import */ var _aql__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./aql */ "./packages/loot-core/src/server/aql/index.js");
+/* harmony import */ var _cloud_storage__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./cloud-storage */ "./packages/loot-core/src/server/cloud-storage.js");
+/* harmony import */ var _crdt__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./crdt */ "./packages/loot-core/src/server/crdt/index.js");
+/* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./db */ "./packages/loot-core/src/server/db/index.js");
+/* harmony import */ var _mutators__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./mutators */ "./packages/loot-core/src/server/mutators.js");
+/* harmony import */ var _prefs__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./prefs */ "./packages/loot-core/src/server/prefs.js");
+/* harmony import */ var _sheet__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./sheet */ "./packages/loot-core/src/server/sheet.js");
+/* harmony import */ var _sync__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(/*! ./sync */ "./packages/loot-core/src/server/sync/index.js");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -45744,6 +45755,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 
 
+
 const connection = __webpack_require__(/*! ../platform/server/connection */ "./packages/loot-core/src/platform/server/connection/index.api.js");
 
 let IMPORT_MODE = false; // This is duplicate from main.js...
@@ -45762,10 +45774,10 @@ function APIError(msg, meta) {
 
 function withMutation(handler) {
   return args => {
-    return Object(_mutators__WEBPACK_IMPORTED_MODULE_10__["runMutator"])(async () => {
-      let latestTimestamp = Object(_crdt__WEBPACK_IMPORTED_MODULE_8__["getClock"])().timestamp.toString();
+    return Object(_mutators__WEBPACK_IMPORTED_MODULE_11__["runMutator"])(async () => {
+      let latestTimestamp = Object(_crdt__WEBPACK_IMPORTED_MODULE_9__["getClock"])().timestamp.toString();
       let result = await handler(args);
-      let rows = await _db__WEBPACK_IMPORTED_MODULE_9__["all"]('SELECT DISTINCT dataset FROM messages_crdt WHERE timestamp > ?', [latestTimestamp]); // Only send the sync event if anybody else is connected
+      let rows = await _db__WEBPACK_IMPORTED_MODULE_10__["all"]('SELECT DISTINCT dataset FROM messages_crdt WHERE timestamp > ?', [latestTimestamp]); // Only send the sync event if anybody else is connected
 
       if (connection.getNumClients() > 1) {
         connection.send('sync-event', {
@@ -45793,7 +45805,7 @@ async function validateMonth(month) {
         start = _await$handlers$getB.start,
         end = _await$handlers$getB.end;
 
-    let range = _shared_months__WEBPACK_IMPORTED_MODULE_0__["range"](start, end);
+    let range = _shared_months__WEBPACK_IMPORTED_MODULE_1__["range"](start, end);
 
     if (!range.includes(month)) {
       throw APIError('No budget exists for month: ' + month);
@@ -45806,7 +45818,7 @@ async function validateExpenseCategory(debug, id) {
     throw APIError(`${debug}: category id is required`);
   }
 
-  let row = await _db__WEBPACK_IMPORTED_MODULE_9__["first"]('SELECT is_income FROM categories WHERE id = ?', [id]);
+  let row = await _db__WEBPACK_IMPORTED_MODULE_10__["first"]('SELECT is_income FROM categories WHERE id = ?', [id]);
 
   if (!row) {
     throw APIError(`${debug}: category "${id}" does not exist`);
@@ -45828,7 +45840,7 @@ handlers['api/batch-budget-start'] = async function () {
 
 
   if (IMPORT_MODE) {
-    _db__WEBPACK_IMPORTED_MODULE_9__["asyncTransaction"](() => {
+    _db__WEBPACK_IMPORTED_MODULE_10__["asyncTransaction"](() => {
       return new Promise((resolve, reject) => {
         batchPromise = {
           resolve,
@@ -45837,7 +45849,7 @@ handlers['api/batch-budget-start'] = async function () {
       });
     });
   } else {
-    Object(_sync__WEBPACK_IMPORTED_MODULE_13__["batchMessages"])(() => {
+    Object(_sync__WEBPACK_IMPORTED_MODULE_14__["batchMessages"])(() => {
       return new Promise((resolve, reject) => {
         batchPromise = {
           resolve,
@@ -45860,7 +45872,7 @@ handlers['api/batch-budget-end'] = async function () {
 handlers['api/load-budget'] = async function ({
   id
 }) {
-  let _ref = _prefs__WEBPACK_IMPORTED_MODULE_11__["getPrefs"]() || {},
+  let _ref = _prefs__WEBPACK_IMPORTED_MODULE_12__["getPrefs"]() || {},
       currentId = _ref.id;
 
   if (currentId !== id) {
@@ -45875,15 +45887,69 @@ handlers['api/load-budget'] = async function ({
       connection.send('finish-load');
     } else {
       connection.send('show-budgets');
+      throw new Error(Object(_shared_errors__WEBPACK_IMPORTED_MODULE_0__["getSyncError"])(error, id));
+    }
+  }
+};
 
-      if (error === 'out-of-sync-migrations' || error === 'out-of-sync-data') {
-        throw new Error('This budget cannot be loaded with this version of the app.');
-      } else if (error === 'budget-not-found') {
-        throw new Error('Budget "' + id + '" not found. Check the id of your budget in the "Advanced" section of the settings page.');
-      } else {
-        throw new Error('We had an unknown problem opening "' + id + '".');
+handlers['api/download-budget'] = async function ({
+  syncId,
+  password
+}) {
+  let _ref2 = _prefs__WEBPACK_IMPORTED_MODULE_12__["getPrefs"]() || {},
+      currentId = _ref2.id;
+
+  if (currentId) {
+    await handlers['close-budget']();
+  }
+
+  let localBudget = (await handlers['get-budgets']()).find(b => b.groupId === syncId);
+
+  if (localBudget) {
+    await handlers['load-budget']({
+      id: localBudget.id
+    });
+    let result = await handlers['sync-budget']({
+      id: localBudget.id
+    });
+
+    if (result.error) {
+      throw new Error(Object(_shared_errors__WEBPACK_IMPORTED_MODULE_0__["getSyncError"])(result.error, localBudget.id));
+    }
+  } else {
+    let files = await handlers['get-remote-files']();
+    let file = files.find(f => f.groupId === syncId);
+
+    if (!file) {
+      throw new Error(`Budget "${syncId}" not found. Check the sync id of your budget in the "Advanced" section of the settings page.`);
+    }
+
+    if (file.encryptKeyId && !password) {
+      throw new Error(`File ${file.name} is encrypted. Please provide a password.`);
+    }
+
+    if (password) {
+      let result = await handlers['key-test']({
+        fileId: file.fileId,
+        password
+      });
+
+      if (result.error) {
+        throw new Error(Object(_shared_errors__WEBPACK_IMPORTED_MODULE_0__["getTestKeyError"])(result.error));
       }
     }
+
+    let result = await handlers['download-budget']({
+      fileId: file.fileId
+    });
+
+    if (result.error) {
+      throw new Error(Object(_shared_errors__WEBPACK_IMPORTED_MODULE_0__["getDownloadError"])(result.error, result.id));
+    }
+
+    await handlers['load-budget']({
+      id: result.id
+    });
   }
 };
 
@@ -45898,20 +45964,20 @@ handlers['api/start-import'] = async function ({
     avoidUpload: true
   }); // Clear out the default expense categories
 
-  await _db__WEBPACK_IMPORTED_MODULE_9__["runQuery"]('DELETE FROM categories WHERE is_income = 0');
-  await _db__WEBPACK_IMPORTED_MODULE_9__["runQuery"]('DELETE FROM category_groups WHERE is_income = 0'); // Turn syncing off
+  await _db__WEBPACK_IMPORTED_MODULE_10__["runQuery"]('DELETE FROM categories WHERE is_income = 0');
+  await _db__WEBPACK_IMPORTED_MODULE_10__["runQuery"]('DELETE FROM category_groups WHERE is_income = 0'); // Turn syncing off
 
-  Object(_sync__WEBPACK_IMPORTED_MODULE_13__["setSyncingMode"])('import');
+  Object(_sync__WEBPACK_IMPORTED_MODULE_14__["setSyncingMode"])('import');
   connection.send('start-import');
   IMPORT_MODE = true;
 };
 
 handlers['api/finish-import'] = async function () {
-  _sheet__WEBPACK_IMPORTED_MODULE_12__["get"]().markCacheDirty(); // We always need to fully reload the app. Importing doesn't touch
+  _sheet__WEBPACK_IMPORTED_MODULE_13__["get"]().markCacheDirty(); // We always need to fully reload the app. Importing doesn't touch
   // the spreadsheet, but we can't just recreate the spreadsheet
   // either; there is other internal state that isn't created
 
-  let _prefs$getPrefs = _prefs__WEBPACK_IMPORTED_MODULE_11__["getPrefs"](),
+  let _prefs$getPrefs = _prefs__WEBPACK_IMPORTED_MODULE_12__["getPrefs"](),
       id = _prefs$getPrefs.id;
 
   await handlers['close-budget']();
@@ -45919,15 +45985,15 @@ handlers['api/finish-import'] = async function () {
     id
   });
   await handlers['get-budget-bounds']();
-  await _sheet__WEBPACK_IMPORTED_MODULE_12__["waitOnSpreadsheet"]();
-  await _cloud_storage__WEBPACK_IMPORTED_MODULE_7__["upload"]().catch(err => {});
+  await _sheet__WEBPACK_IMPORTED_MODULE_13__["waitOnSpreadsheet"]();
+  await _cloud_storage__WEBPACK_IMPORTED_MODULE_8__["upload"]().catch(err => {});
   connection.send('finish-import');
   IMPORT_MODE = false;
 };
 
 handlers['api/abort-import'] = async function () {
   if (IMPORT_MODE) {
-    let _prefs$getPrefs2 = _prefs__WEBPACK_IMPORTED_MODULE_11__["getPrefs"](),
+    let _prefs$getPrefs2 = _prefs__WEBPACK_IMPORTED_MODULE_12__["getPrefs"](),
         id = _prefs$getPrefs2.id;
 
     await handlers['close-budget']();
@@ -45943,7 +46009,7 @@ handlers['api/abort-import'] = async function () {
 handlers['api/query'] = async function ({
   query
 }) {
-  return Object(_aql__WEBPACK_IMPORTED_MODULE_6__["runQuery"])(query);
+  return Object(_aql__WEBPACK_IMPORTED_MODULE_7__["runQuery"])(query);
 };
 
 handlers['api/budget-months'] = async function () {
@@ -45951,18 +46017,18 @@ handlers['api/budget-months'] = async function () {
       start = _await$handlers$getB2.start,
       end = _await$handlers$getB2.end;
 
-  return _shared_months__WEBPACK_IMPORTED_MODULE_0__["range"](start, end);
+  return _shared_months__WEBPACK_IMPORTED_MODULE_1__["range"](start, end);
 };
 
 handlers['api/budget-month'] = async function ({
   month
 }) {
   await validateMonth(month);
-  let groups = await _db__WEBPACK_IMPORTED_MODULE_9__["getCategoriesGrouped"]();
-  let sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__["sheetForMonth"](month);
+  let groups = await _db__WEBPACK_IMPORTED_MODULE_10__["getCategoriesGrouped"]();
+  let sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_1__["sheetForMonth"](month);
 
   function value(name) {
-    let v = _sheet__WEBPACK_IMPORTED_MODULE_12__["get"]().getCellValue(sheetName, name);
+    let v = _sheet__WEBPACK_IMPORTED_MODULE_13__["get"]().getCellValue(sheetName, name);
     return v === '' ? 0 : v;
   } // This is duplicated from main.js because the return format is
   // different (for now)
@@ -45981,19 +46047,19 @@ handlers['api/budget-month'] = async function ({
     totalBalance: value('total-leftover'),
     categoryGroups: groups.map(group => {
       if (group.is_income) {
-        return _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryGroupModel"].toExternal(group)), {}, {
+        return _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryGroupModel"].toExternal(group)), {}, {
           received: value('total-income'),
-          categories: group.categories.map(cat => _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryModel"].toExternal(cat)), {}, {
+          categories: group.categories.map(cat => _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryModel"].toExternal(cat)), {}, {
             received: value(`sum-amount-${cat.id}`)
           }))
         });
       }
 
-      return _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryGroupModel"].toExternal(group)), {}, {
+      return _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryGroupModel"].toExternal(group)), {}, {
         budgeted: value(`group-budget-${group.id}`),
         spent: value(`group-sum-amount-${group.id}`),
         balance: value(`group-leftover-${group.id}`),
-        categories: group.categories.map(cat => _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryModel"].toExternal(cat)), {}, {
+        categories: group.categories.map(cat => _objectSpread(_objectSpread({}, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryModel"].toExternal(cat)), {}, {
           budgeted: value(`budget-${cat.id}`),
           spent: value(`sum-amount-${cat.id}`),
           balance: value(`leftover-${cat.id}`),
@@ -46054,7 +46120,7 @@ handlers['api/transactions-add'] = withMutation(async function ({
   accountId,
   transactions
 }) {
-  await Object(_accounts_sync__WEBPACK_IMPORTED_MODULE_4__["addTransactions"])(accountId, transactions, {
+  await Object(_accounts_sync__WEBPACK_IMPORTED_MODULE_5__["addTransactions"])(accountId, transactions, {
     runTransfers: false
   });
   return 'ok';
@@ -46065,7 +46131,7 @@ handlers['api/transactions-get'] = async function ({
   startDate,
   endDate
 }) {
-  let _await$aqlQuery = await Object(_aql__WEBPACK_IMPORTED_MODULE_6__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_1__["default"])('transactions').filter({
+  let _await$aqlQuery = await Object(_aql__WEBPACK_IMPORTED_MODULE_7__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_2__["default"])('transactions').filter({
     $and: [accountId && {
       account: accountId
     }, startDate && {
@@ -46096,20 +46162,20 @@ handlers['api/transaction-update'] = withMutation(async function ({
   id,
   fields
 }) {
-  let _await$aqlQuery2 = await Object(_aql__WEBPACK_IMPORTED_MODULE_6__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_1__["default"])('transactions').filter({
+  let _await$aqlQuery2 = await Object(_aql__WEBPACK_IMPORTED_MODULE_7__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_2__["default"])('transactions').filter({
     id
   }).select('*').options({
     splits: 'grouped'
   })),
       data = _await$aqlQuery2.data;
 
-  let transactions = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_2__["ungroupTransactions"])(data);
+  let transactions = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_3__["ungroupTransactions"])(data);
 
   if (transactions.length === 0) {
     return [];
   }
 
-  let _updateTransaction = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_2__["updateTransaction"])(transactions, fields),
+  let _updateTransaction = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_3__["updateTransaction"])(transactions, fields),
       diff = _updateTransaction.diff;
 
   return handlers['transactions-batch-update'](diff);
@@ -46117,28 +46183,28 @@ handlers['api/transaction-update'] = withMutation(async function ({
 handlers['api/transaction-delete'] = withMutation(async function ({
   id
 }) {
-  let _await$aqlQuery3 = await Object(_aql__WEBPACK_IMPORTED_MODULE_6__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_1__["default"])('transactions').filter({
+  let _await$aqlQuery3 = await Object(_aql__WEBPACK_IMPORTED_MODULE_7__["runQuery"])(Object(_shared_query__WEBPACK_IMPORTED_MODULE_2__["default"])('transactions').filter({
     id
   }).select('*').options({
     splits: 'grouped'
   })),
       data = _await$aqlQuery3.data;
 
-  let transactions = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_2__["ungroupTransactions"])(data);
+  let transactions = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_3__["ungroupTransactions"])(data);
 
   if (transactions.length === 0) {
     return [];
   }
 
-  let _deleteTransaction = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_2__["deleteTransaction"])(transactions, id),
+  let _deleteTransaction = Object(_shared_transactions__WEBPACK_IMPORTED_MODULE_3__["deleteTransaction"])(transactions, id),
       diff = _deleteTransaction.diff;
 
   return handlers['transactions-batch-update'](diff);
 });
 
 handlers['api/accounts-get'] = async function () {
-  let accounts = await _db__WEBPACK_IMPORTED_MODULE_9__["getAccounts"]();
-  return accounts.map(account => _api_models__WEBPACK_IMPORTED_MODULE_5__["accountModel"].toExternal(account));
+  let accounts = await _db__WEBPACK_IMPORTED_MODULE_10__["getAccounts"]();
+  return accounts.map(account => _api_models__WEBPACK_IMPORTED_MODULE_6__["accountModel"].toExternal(account));
 };
 
 handlers['api/account-create'] = withMutation(async function ({
@@ -46152,16 +46218,16 @@ handlers['api/account-create'] = withMutation(async function ({
     closed: account.closed,
     // Current the API expects an amount but it really should expect
     // an integer
-    balance: initialBalance != null ? Object(_shared_util__WEBPACK_IMPORTED_MODULE_3__["integerToAmount"])(initialBalance) : null
+    balance: initialBalance != null ? Object(_shared_util__WEBPACK_IMPORTED_MODULE_4__["integerToAmount"])(initialBalance) : null
   });
 });
 handlers['api/account-update'] = withMutation(async function ({
   id,
   fields
 }) {
-  return _db__WEBPACK_IMPORTED_MODULE_9__["updateAccount"](_objectSpread({
+  return _db__WEBPACK_IMPORTED_MODULE_10__["updateAccount"](_objectSpread({
     id
-  }, _api_models__WEBPACK_IMPORTED_MODULE_5__["accountModel"].fromExternal(fields)));
+  }, _api_models__WEBPACK_IMPORTED_MODULE_6__["accountModel"].fromExternal(fields)));
 });
 handlers['api/account-close'] = withMutation(async function ({
   id,
@@ -46194,7 +46260,7 @@ handlers['api/categories-get'] = async function ({
   grouped
 } = {}) {
   let result = await handlers['get-categories']();
-  return grouped ? result.grouped.map(_api_models__WEBPACK_IMPORTED_MODULE_5__["categoryGroupModel"].toExternal) : result.list.map(_api_models__WEBPACK_IMPORTED_MODULE_5__["categoryModel"].toExternal);
+  return grouped ? result.grouped.map(_api_models__WEBPACK_IMPORTED_MODULE_6__["categoryGroupModel"].toExternal) : result.list.map(_api_models__WEBPACK_IMPORTED_MODULE_6__["categoryModel"].toExternal);
 };
 
 handlers['api/category-group-create'] = withMutation(async function ({
@@ -46210,7 +46276,7 @@ handlers['api/category-group-update'] = withMutation(async function ({
 }) {
   return handlers['category-group-update'](_objectSpread({
     id
-  }, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryGroupModel"].fromExternal(fields)));
+  }, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryGroupModel"].fromExternal(fields)));
 });
 handlers['api/category-group-delete'] = withMutation(async function ({
   id,
@@ -46236,7 +46302,7 @@ handlers['api/category-update'] = withMutation(async function ({
 }) {
   return handlers['category-update'](_objectSpread({
     id
-  }, _api_models__WEBPACK_IMPORTED_MODULE_5__["categoryModel"].fromExternal(fields)));
+  }, _api_models__WEBPACK_IMPORTED_MODULE_6__["categoryModel"].fromExternal(fields)));
 });
 handlers['api/category-delete'] = withMutation(async function ({
   id,
@@ -46250,7 +46316,7 @@ handlers['api/category-delete'] = withMutation(async function ({
 
 handlers['api/payees-get'] = async function () {
   let payees = await handlers['payees-get']();
-  return payees.map(_api_models__WEBPACK_IMPORTED_MODULE_5__["payeeModel"].toExternal);
+  return payees.map(_api_models__WEBPACK_IMPORTED_MODULE_6__["payeeModel"].toExternal);
 };
 
 handlers['api/payee-create'] = withMutation(async function ({
@@ -46267,7 +46333,7 @@ handlers['api/payee-update'] = withMutation(async function ({
   return handlers['payees-batch-change']({
     updated: [_objectSpread({
       id
-    }, _api_models__WEBPACK_IMPORTED_MODULE_5__["payeeModel"].fromExternal(fields))]
+    }, _api_models__WEBPACK_IMPORTED_MODULE_6__["payeeModel"].fromExternal(fields))]
   });
 });
 handlers['api/payee-delete'] = withMutation(async function ({
@@ -46286,7 +46352,7 @@ handlers['api/payee-rules-get'] = async function ({
   let rules = await handlers['payees-get-rules']({
     id: payeeId
   });
-  return rules.map(_api_models__WEBPACK_IMPORTED_MODULE_5__["payeeRuleModel"].toExternal);
+  return rules.map(_api_models__WEBPACK_IMPORTED_MODULE_6__["payeeRuleModel"].toExternal);
 };
 
 handlers['api/payee-rule-create'] = withMutation(async function ({
@@ -46305,7 +46371,7 @@ handlers['api/payee-rule-update'] = withMutation(async function ({
 }) {
   return handlers['payees-update-rule'](_objectSpread({
     id
-  }, _api_models__WEBPACK_IMPORTED_MODULE_5__["payeeRuleModel"].fromExternal(fields)));
+  }, _api_models__WEBPACK_IMPORTED_MODULE_6__["payeeRuleModel"].fromExternal(fields)));
 });
 handlers['api/payee-rule-delete'] = withMutation(async function ({
   id
@@ -49633,98 +49699,1586 @@ async function createBudget(months) {
   meta.createdMonths = meta.createdMonths || new Set();
   let budgetType = getBudgetType();
 
-  if (budgetType === 'rollover') {
-    _rollover__WEBPACK_IMPORTED_MODULE_7__["createBudget"](meta, categories, months);
+  if (budgetType === 'rollover') {
+    _rollover__WEBPACK_IMPORTED_MODULE_7__["createBudget"](meta, categories, months);
+  }
+
+  months.forEach(month => {
+    if (!meta.createdMonths.has(month)) {
+      let prevMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__["prevMonth"](month);
+
+      let _monthUtils$bounds2 = _shared_months__WEBPACK_IMPORTED_MODULE_0__["bounds"](month),
+          start = _monthUtils$bounds2.start,
+          end = _monthUtils$bounds2.end;
+
+      let sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__["sheetForMonth"](month, budgetType);
+      let prevSheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__["sheetForMonth"](prevMonth, budgetType);
+      categories.forEach(cat => {
+        createCategory(cat, sheetName, prevSheetName, start, end);
+      });
+      groups.forEach(group => {
+        createCategoryGroup(group, sheetName);
+      });
+
+      if (budgetType === 'rollover') {
+        _rollover__WEBPACK_IMPORTED_MODULE_7__["createSummary"](groups, categories, prevSheetName, sheetName);
+      } else {
+        _report__WEBPACK_IMPORTED_MODULE_6__["createSummary"](groups, categories, sheetName);
+      }
+
+      meta.createdMonths.add(month);
+    }
+  });
+  _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().setMeta(meta);
+  _sheet__WEBPACK_IMPORTED_MODULE_3__["endTransaction"](); // Wait for the spreadsheet to finish computing. Normally this won't
+  // do anything (as values are cached) but on first run this need to
+  // show the loading screen while it initially sets up.
+
+  await _sheet__WEBPACK_IMPORTED_MODULE_3__["waitOnSpreadsheet"]();
+}
+async function createAllBudgets() {
+  let earliestTransaction = await _db__WEBPACK_IMPORTED_MODULE_2__["first"]('SELECT * FROM transactions WHERE isChild=0 AND date IS NOT NULL ORDER BY date ASC LIMIT 1');
+  let earliestDate = earliestTransaction && _db__WEBPACK_IMPORTED_MODULE_2__["fromDateRepr"](earliestTransaction.date);
+  let currentMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__["currentMonth"](); // Get the range based off of the earliest transaction and the
+  // current month. If no transactions currently exist the current
+  // month is also used as the starting month
+
+  let _getBudgetRange = getBudgetRange(earliestDate || currentMonth, currentMonth),
+      start = _getBudgetRange.start,
+      end = _getBudgetRange.end,
+      range = _getBudgetRange.range;
+
+  let meta = _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().meta();
+  let createdMonths = meta.createdMonths || new Set();
+  let newMonths = range.filter(m => !createdMonths.has(m));
+
+  if (newMonths.length > 0) {
+    await createBudget(range);
+  }
+
+  return {
+    start,
+    end
+  };
+}
+async function setType(type) {
+  let meta = _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().meta();
+
+  if (type === meta.budgetType) {
+    return;
+  }
+
+  meta.budgetType = type;
+  meta.createdMonths = new Set(); // Go through and force all the cells to be recomputed
+
+  let nodes = _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().getNodes();
+  _db__WEBPACK_IMPORTED_MODULE_2__["transaction"](() => {
+    for (let name of nodes.keys()) {
+      let _name$split = name.split('!'),
+          _name$split2 = _slicedToArray(_name$split, 2),
+          sheetName = _name$split2[0],
+          cellName = _name$split2[1];
+
+      if (sheetName.match(/^budget\d+/)) {
+        _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().deleteCell(sheetName, cellName);
+      }
+    }
+  });
+  _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().startCacheBarrier();
+  _sheet__WEBPACK_IMPORTED_MODULE_3__["loadUserBudgets"](_db__WEBPACK_IMPORTED_MODULE_2__);
+  let bounds = await createAllBudgets();
+  _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().endCacheBarrier();
+  return bounds;
+}
+
+/***/ }),
+
+/***/ "./packages/loot-core/src/server/budget/goal-template.pegjs":
+/*!******************************************************************!*\
+  !*** ./packages/loot-core/src/server/budget/goal-template.pegjs ***!
+  \******************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+/*
+ * Generated by PEG.js 0.10.0.
+ *
+ * http://pegjs.org/
+ */
+
+
+
+function peg$subclass(child, parent) {
+  function ctor() { this.constructor = child; }
+  ctor.prototype = parent.prototype;
+  child.prototype = new ctor();
+}
+
+function peg$SyntaxError(message, expected, found, location) {
+  this.message  = message;
+  this.expected = expected;
+  this.found    = found;
+  this.location = location;
+  this.name     = "SyntaxError";
+
+  if (typeof Error.captureStackTrace === "function") {
+    Error.captureStackTrace(this, peg$SyntaxError);
+  }
+}
+
+peg$subclass(peg$SyntaxError, Error);
+
+peg$SyntaxError.buildMessage = function(expected, found) {
+  var DESCRIBE_EXPECTATION_FNS = {
+        literal: function(expectation) {
+          return "\"" + literalEscape(expectation.text) + "\"";
+        },
+
+        "class": function(expectation) {
+          var escapedParts = "",
+              i;
+
+          for (i = 0; i < expectation.parts.length; i++) {
+            escapedParts += expectation.parts[i] instanceof Array
+              ? classEscape(expectation.parts[i][0]) + "-" + classEscape(expectation.parts[i][1])
+              : classEscape(expectation.parts[i]);
+          }
+
+          return "[" + (expectation.inverted ? "^" : "") + escapedParts + "]";
+        },
+
+        any: function(expectation) {
+          return "any character";
+        },
+
+        end: function(expectation) {
+          return "end of input";
+        },
+
+        other: function(expectation) {
+          return expectation.description;
+        }
+      };
+
+  function hex(ch) {
+    return ch.charCodeAt(0).toString(16).toUpperCase();
+  }
+
+  function literalEscape(s) {
+    return s
+      .replace(/\\/g, '\\\\')
+      .replace(/"/g,  '\\"')
+      .replace(/\0/g, '\\0')
+      .replace(/\t/g, '\\t')
+      .replace(/\n/g, '\\n')
+      .replace(/\r/g, '\\r')
+      .replace(/[\x00-\x0F]/g,          function(ch) { return '\\x0' + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x'  + hex(ch); });
+  }
+
+  function classEscape(s) {
+    return s
+      .replace(/\\/g, '\\\\')
+      .replace(/\]/g, '\\]')
+      .replace(/\^/g, '\\^')
+      .replace(/-/g,  '\\-')
+      .replace(/\0/g, '\\0')
+      .replace(/\t/g, '\\t')
+      .replace(/\n/g, '\\n')
+      .replace(/\r/g, '\\r')
+      .replace(/[\x00-\x0F]/g,          function(ch) { return '\\x0' + hex(ch); })
+      .replace(/[\x10-\x1F\x7F-\x9F]/g, function(ch) { return '\\x'  + hex(ch); });
+  }
+
+  function describeExpectation(expectation) {
+    return DESCRIBE_EXPECTATION_FNS[expectation.type](expectation);
+  }
+
+  function describeExpected(expected) {
+    var descriptions = new Array(expected.length),
+        i, j;
+
+    for (i = 0; i < expected.length; i++) {
+      descriptions[i] = describeExpectation(expected[i]);
+    }
+
+    descriptions.sort();
+
+    if (descriptions.length > 0) {
+      for (i = 1, j = 1; i < descriptions.length; i++) {
+        if (descriptions[i - 1] !== descriptions[i]) {
+          descriptions[j] = descriptions[i];
+          j++;
+        }
+      }
+      descriptions.length = j;
+    }
+
+    switch (descriptions.length) {
+      case 1:
+        return descriptions[0];
+
+      case 2:
+        return descriptions[0] + " or " + descriptions[1];
+
+      default:
+        return descriptions.slice(0, -1).join(", ")
+          + ", or "
+          + descriptions[descriptions.length - 1];
+    }
+  }
+
+  function describeFound(found) {
+    return found ? "\"" + literalEscape(found) + "\"" : "end of input";
+  }
+
+  return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
+};
+
+function peg$parse(input, options) {
+  options = options !== void 0 ? options : {};
+
+  var peg$FAILED = {},
+
+      peg$startRuleFunctions = { expr: peg$parseexpr },
+      peg$startRuleFunction  = peg$parseexpr,
+
+      peg$c0 = /^[^\n]/,
+      peg$c1 = peg$classExpectation(["\n"], true, false),
+      peg$c2 = function(percent, category) { return { type: 'percentage', percent: +percent, category } },
+      peg$c3 = function(amount, weeks, starting, limit) { return { type: 'week', amount, weeks, starting, limit } },
+      peg$c4 = function(amount, month, from, repeat) { return {
+            type: from ? 'spend' : 'by',
+            amount,
+            month,
+            ...(repeat ? repeat[3] : {}),
+            from
+          } },
+      peg$c5 = function(monthly, limit) { return { type: 'simple', monthly, limit } },
+      peg$c6 = function(limit) { return { type: 'simple', limit } },
+      peg$c7 = peg$otherExpectation("repeat interval"),
+      peg$c8 = "month",
+      peg$c9 = peg$literalExpectation("month", false),
+      peg$c10 = function() { return { annual: false } },
+      peg$c11 = "months",
+      peg$c12 = peg$literalExpectation("months", false),
+      peg$c13 = function(months) { return { annual: false, repeat: +months } },
+      peg$c14 = "year",
+      peg$c15 = peg$literalExpectation("year", false),
+      peg$c16 = function() { return { annual: true } },
+      peg$c17 = "years",
+      peg$c18 = peg$literalExpectation("years", false),
+      peg$c19 = function(years) { return { annual: true, repeat: +years } },
+      peg$c20 = function(amount) { return amount },
+      peg$c21 = function() { return null },
+      peg$c22 = function(n) { return +n },
+      peg$c23 = "spend",
+      peg$c24 = peg$literalExpectation("spend", false),
+      peg$c25 = "from",
+      peg$c26 = peg$literalExpectation("from", false),
+      peg$c27 = function(month) { return month },
+      peg$c28 = "week",
+      peg$c29 = peg$literalExpectation("week", false),
+      peg$c30 = "weeks",
+      peg$c31 = peg$literalExpectation("weeks", false),
+      peg$c32 = "by",
+      peg$c33 = peg$literalExpectation("by", false),
+      peg$c34 = "of",
+      peg$c35 = peg$literalExpectation("of", false),
+      peg$c36 = "repeat",
+      peg$c37 = peg$literalExpectation("repeat", false),
+      peg$c38 = "every",
+      peg$c39 = peg$literalExpectation("every", false),
+      peg$c40 = "starting",
+      peg$c41 = peg$literalExpectation("starting", false),
+      peg$c42 = "up",
+      peg$c43 = peg$literalExpectation("up", false),
+      peg$c44 = "to",
+      peg$c45 = peg$literalExpectation("to", false),
+      peg$c46 = peg$otherExpectation("space"),
+      peg$c47 = " ",
+      peg$c48 = peg$literalExpectation(" ", false),
+      peg$c49 = peg$otherExpectation("digit"),
+      peg$c50 = /^[0-9]/,
+      peg$c51 = peg$classExpectation([["0", "9"]], false, false),
+      peg$c52 = peg$otherExpectation("number"),
+      peg$c53 = peg$otherExpectation("amount"),
+      peg$c54 = ".",
+      peg$c55 = peg$literalExpectation(".", false),
+      peg$c56 = function(amount) { return +amount },
+      peg$c57 = peg$otherExpectation("percentage"),
+      peg$c58 = "%",
+      peg$c59 = peg$literalExpectation("%", false),
+      peg$c60 = function(percent) { return +percent },
+      peg$c61 = peg$otherExpectation("year"),
+      peg$c62 = peg$otherExpectation("month"),
+      peg$c63 = "-",
+      peg$c64 = peg$literalExpectation("-", false),
+      peg$c65 = peg$otherExpectation("day"),
+      peg$c66 = peg$otherExpectation("currency symbol"),
+      peg$c67 = peg$anyExpectation(),
+      peg$c68 = function(symbol) { return /\p{Sc}/u.test(symbol) },
+
+      peg$currPos          = 0,
+      peg$savedPos         = 0,
+      peg$posDetailsCache  = [{ line: 1, column: 1 }],
+      peg$maxFailPos       = 0,
+      peg$maxFailExpected  = [],
+      peg$silentFails      = 0,
+
+      peg$result;
+
+  if ("startRule" in options) {
+    if (!(options.startRule in peg$startRuleFunctions)) {
+      throw new Error("Can't start parsing from rule \"" + options.startRule + "\".");
+    }
+
+    peg$startRuleFunction = peg$startRuleFunctions[options.startRule];
+  }
+
+  function text() {
+    return input.substring(peg$savedPos, peg$currPos);
+  }
+
+  function location() {
+    return peg$computeLocation(peg$savedPos, peg$currPos);
+  }
+
+  function expected(description, location) {
+    location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
+
+    throw peg$buildStructuredError(
+      [peg$otherExpectation(description)],
+      input.substring(peg$savedPos, peg$currPos),
+      location
+    );
+  }
+
+  function error(message, location) {
+    location = location !== void 0 ? location : peg$computeLocation(peg$savedPos, peg$currPos)
+
+    throw peg$buildSimpleError(message, location);
+  }
+
+  function peg$literalExpectation(text, ignoreCase) {
+    return { type: "literal", text: text, ignoreCase: ignoreCase };
+  }
+
+  function peg$classExpectation(parts, inverted, ignoreCase) {
+    return { type: "class", parts: parts, inverted: inverted, ignoreCase: ignoreCase };
+  }
+
+  function peg$anyExpectation() {
+    return { type: "any" };
+  }
+
+  function peg$endExpectation() {
+    return { type: "end" };
+  }
+
+  function peg$otherExpectation(description) {
+    return { type: "other", description: description };
+  }
+
+  function peg$computePosDetails(pos) {
+    var details = peg$posDetailsCache[pos], p;
+
+    if (details) {
+      return details;
+    } else {
+      p = pos - 1;
+      while (!peg$posDetailsCache[p]) {
+        p--;
+      }
+
+      details = peg$posDetailsCache[p];
+      details = {
+        line:   details.line,
+        column: details.column
+      };
+
+      while (p < pos) {
+        if (input.charCodeAt(p) === 10) {
+          details.line++;
+          details.column = 1;
+        } else {
+          details.column++;
+        }
+
+        p++;
+      }
+
+      peg$posDetailsCache[pos] = details;
+      return details;
+    }
+  }
+
+  function peg$computeLocation(startPos, endPos) {
+    var startPosDetails = peg$computePosDetails(startPos),
+        endPosDetails   = peg$computePosDetails(endPos);
+
+    return {
+      start: {
+        offset: startPos,
+        line:   startPosDetails.line,
+        column: startPosDetails.column
+      },
+      end: {
+        offset: endPos,
+        line:   endPosDetails.line,
+        column: endPosDetails.column
+      }
+    };
+  }
+
+  function peg$fail(expected) {
+    if (peg$currPos < peg$maxFailPos) { return; }
+
+    if (peg$currPos > peg$maxFailPos) {
+      peg$maxFailPos = peg$currPos;
+      peg$maxFailExpected = [];
+    }
+
+    peg$maxFailExpected.push(expected);
+  }
+
+  function peg$buildSimpleError(message, location) {
+    return new peg$SyntaxError(message, null, null, location);
+  }
+
+  function peg$buildStructuredError(expected, found, location) {
+    return new peg$SyntaxError(
+      peg$SyntaxError.buildMessage(expected, found),
+      expected,
+      found,
+      location
+    );
+  }
+
+  function peg$parseexpr() {
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11;
+
+    s0 = peg$currPos;
+    s1 = peg$parsepercent();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parseof();
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parse_();
+          if (s4 !== peg$FAILED) {
+            s5 = peg$currPos;
+            s6 = [];
+            if (peg$c0.test(input.charAt(peg$currPos))) {
+              s7 = input.charAt(peg$currPos);
+              peg$currPos++;
+            } else {
+              s7 = peg$FAILED;
+              if (peg$silentFails === 0) { peg$fail(peg$c1); }
+            }
+            while (s7 !== peg$FAILED) {
+              s6.push(s7);
+              if (peg$c0.test(input.charAt(peg$currPos))) {
+                s7 = input.charAt(peg$currPos);
+                peg$currPos++;
+              } else {
+                s7 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$c1); }
+              }
+            }
+            if (s6 !== peg$FAILED) {
+              s5 = input.substring(s5, peg$currPos);
+            } else {
+              s5 = s6;
+            }
+            if (s5 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$c2(s1, s5);
+              s0 = s1;
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parseamount();
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parse_();
+        if (s2 !== peg$FAILED) {
+          s3 = peg$parserepeatEvery();
+          if (s3 !== peg$FAILED) {
+            s4 = peg$parse_();
+            if (s4 !== peg$FAILED) {
+              s5 = peg$parseweekCount();
+              if (s5 !== peg$FAILED) {
+                s6 = peg$parse_();
+                if (s6 !== peg$FAILED) {
+                  s7 = peg$parsestarting();
+                  if (s7 !== peg$FAILED) {
+                    s8 = peg$parse_();
+                    if (s8 !== peg$FAILED) {
+                      s9 = peg$parsedate();
+                      if (s9 !== peg$FAILED) {
+                        s10 = peg$parselimit();
+                        if (s10 === peg$FAILED) {
+                          s10 = null;
+                        }
+                        if (s10 !== peg$FAILED) {
+                          peg$savedPos = s0;
+                          s1 = peg$c3(s1, s5, s9, s10);
+                          s0 = s1;
+                        } else {
+                          peg$currPos = s0;
+                          s0 = peg$FAILED;
+                        }
+                      } else {
+                        peg$currPos = s0;
+                        s0 = peg$FAILED;
+                      }
+                    } else {
+                      peg$currPos = s0;
+                      s0 = peg$FAILED;
+                    }
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        s1 = peg$parseamount();
+        if (s1 !== peg$FAILED) {
+          s2 = peg$parse_();
+          if (s2 !== peg$FAILED) {
+            s3 = peg$parseby();
+            if (s3 !== peg$FAILED) {
+              s4 = peg$parse_();
+              if (s4 !== peg$FAILED) {
+                s5 = peg$parsemonth();
+                if (s5 !== peg$FAILED) {
+                  s6 = peg$parsespendFrom();
+                  if (s6 === peg$FAILED) {
+                    s6 = null;
+                  }
+                  if (s6 !== peg$FAILED) {
+                    s7 = peg$currPos;
+                    s8 = peg$parse_();
+                    if (s8 !== peg$FAILED) {
+                      s9 = peg$parserepeatEvery();
+                      if (s9 !== peg$FAILED) {
+                        s10 = peg$parse_();
+                        if (s10 !== peg$FAILED) {
+                          s11 = peg$parserepeat();
+                          if (s11 !== peg$FAILED) {
+                            s8 = [s8, s9, s10, s11];
+                            s7 = s8;
+                          } else {
+                            peg$currPos = s7;
+                            s7 = peg$FAILED;
+                          }
+                        } else {
+                          peg$currPos = s7;
+                          s7 = peg$FAILED;
+                        }
+                      } else {
+                        peg$currPos = s7;
+                        s7 = peg$FAILED;
+                      }
+                    } else {
+                      peg$currPos = s7;
+                      s7 = peg$FAILED;
+                    }
+                    if (s7 === peg$FAILED) {
+                      s7 = null;
+                    }
+                    if (s7 !== peg$FAILED) {
+                      peg$savedPos = s0;
+                      s1 = peg$c4(s1, s5, s6, s7);
+                      s0 = s1;
+                    } else {
+                      peg$currPos = s0;
+                      s0 = peg$FAILED;
+                    }
+                  } else {
+                    peg$currPos = s0;
+                    s0 = peg$FAILED;
+                  }
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          s1 = peg$parseamount();
+          if (s1 !== peg$FAILED) {
+            s2 = peg$parselimit();
+            if (s2 === peg$FAILED) {
+              s2 = null;
+            }
+            if (s2 !== peg$FAILED) {
+              peg$savedPos = s0;
+              s1 = peg$c5(s1, s2);
+              s0 = s1;
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+          if (s0 === peg$FAILED) {
+            s0 = peg$currPos;
+            s1 = peg$parseupTo();
+            if (s1 !== peg$FAILED) {
+              s2 = peg$parse_();
+              if (s2 !== peg$FAILED) {
+                s3 = peg$parseamount();
+                if (s3 !== peg$FAILED) {
+                  peg$savedPos = s0;
+                  s1 = peg$c6(s3);
+                  s0 = s1;
+                } else {
+                  peg$currPos = s0;
+                  s0 = peg$FAILED;
+                }
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          }
+        }
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parserepeat() {
+    var s0, s1, s2, s3;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 5) === peg$c8) {
+      s1 = peg$c8;
+      peg$currPos += 5;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c9); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$c10();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parsed();
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parse_();
+        if (s2 !== peg$FAILED) {
+          if (input.substr(peg$currPos, 6) === peg$c11) {
+            s3 = peg$c11;
+            peg$currPos += 6;
+          } else {
+            s3 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$c12); }
+          }
+          if (s3 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c13(s1);
+            s0 = s1;
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+      if (s0 === peg$FAILED) {
+        s0 = peg$currPos;
+        if (input.substr(peg$currPos, 4) === peg$c14) {
+          s1 = peg$c14;
+          peg$currPos += 4;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c15); }
+        }
+        if (s1 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$c16();
+        }
+        s0 = s1;
+        if (s0 === peg$FAILED) {
+          s0 = peg$currPos;
+          s1 = peg$parsed();
+          if (s1 !== peg$FAILED) {
+            s2 = peg$parse_();
+            if (s2 !== peg$FAILED) {
+              if (input.substr(peg$currPos, 5) === peg$c17) {
+                s3 = peg$c17;
+                peg$currPos += 5;
+              } else {
+                s3 = peg$FAILED;
+                if (peg$silentFails === 0) { peg$fail(peg$c18); }
+              }
+              if (s3 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c19(s1);
+                s0 = s1;
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        }
+      }
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c7); }
+    }
+
+    return s0;
+  }
+
+  function peg$parselimit() {
+    var s0, s1, s2, s3, s4;
+
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parseupTo();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parse_();
+        if (s3 !== peg$FAILED) {
+          s4 = peg$parseamount();
+          if (s4 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c20(s4);
+            s0 = s1;
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseweekCount() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    s1 = peg$parseweek();
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = s0;
+      s1 = peg$c21();
+    }
+    s0 = s1;
+    if (s0 === peg$FAILED) {
+      s0 = peg$currPos;
+      s1 = peg$parsenumber();
+      if (s1 !== peg$FAILED) {
+        s2 = peg$parse_();
+        if (s2 !== peg$FAILED) {
+          s3 = peg$parseweeks();
+          if (s3 !== peg$FAILED) {
+            peg$savedPos = s0;
+            s1 = peg$c22(s1);
+            s0 = s1;
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    }
+
+    return s0;
+  }
+
+  function peg$parsespendFrom() {
+    var s0, s1, s2, s3, s4, s5, s6;
+
+    s0 = peg$currPos;
+    s1 = peg$parse_();
+    if (s1 !== peg$FAILED) {
+      if (input.substr(peg$currPos, 5) === peg$c23) {
+        s2 = peg$c23;
+        peg$currPos += 5;
+      } else {
+        s2 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$c24); }
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$parse_();
+        if (s3 !== peg$FAILED) {
+          if (input.substr(peg$currPos, 4) === peg$c25) {
+            s4 = peg$c25;
+            peg$currPos += 4;
+          } else {
+            s4 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$c26); }
+          }
+          if (s4 !== peg$FAILED) {
+            s5 = peg$parse_();
+            if (s5 !== peg$FAILED) {
+              s6 = peg$parsemonth();
+              if (s6 !== peg$FAILED) {
+                peg$savedPos = s0;
+                s1 = peg$c27(s6);
+                s0 = s1;
+              } else {
+                peg$currPos = s0;
+                s0 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s0;
+              s0 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s0;
+            s0 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parseweek() {
+    var s0;
+
+    if (input.substr(peg$currPos, 4) === peg$c28) {
+      s0 = peg$c28;
+      peg$currPos += 4;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c29); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseweeks() {
+    var s0;
+
+    if (input.substr(peg$currPos, 5) === peg$c30) {
+      s0 = peg$c30;
+      peg$currPos += 5;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c31); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseby() {
+    var s0;
+
+    if (input.substr(peg$currPos, 2) === peg$c32) {
+      s0 = peg$c32;
+      peg$currPos += 2;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c33); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseof() {
+    var s0;
+
+    if (input.substr(peg$currPos, 2) === peg$c34) {
+      s0 = peg$c34;
+      peg$currPos += 2;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c35); }
+    }
+
+    return s0;
+  }
+
+  function peg$parserepeatEvery() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 6) === peg$c36) {
+      s1 = peg$c36;
+      peg$currPos += 6;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c37); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 !== peg$FAILED) {
+        if (input.substr(peg$currPos, 5) === peg$c38) {
+          s3 = peg$c38;
+          peg$currPos += 5;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c39); }
+        }
+        if (s3 !== peg$FAILED) {
+          s1 = [s1, s2, s3];
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parsestarting() {
+    var s0;
+
+    if (input.substr(peg$currPos, 8) === peg$c40) {
+      s0 = peg$c40;
+      peg$currPos += 8;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c41); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseupTo() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 2) === peg$c42) {
+      s1 = peg$c42;
+      peg$currPos += 2;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c43); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 !== peg$FAILED) {
+        if (input.substr(peg$currPos, 2) === peg$c44) {
+          s3 = peg$c44;
+          peg$currPos += 2;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c45); }
+        }
+        if (s3 !== peg$FAILED) {
+          s1 = [s1, s2, s3];
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parse_() {
+    var s0, s1;
+
+    peg$silentFails++;
+    s0 = [];
+    if (input.charCodeAt(peg$currPos) === 32) {
+      s1 = peg$c47;
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c48); }
+    }
+    if (s1 !== peg$FAILED) {
+      while (s1 !== peg$FAILED) {
+        s0.push(s1);
+        if (input.charCodeAt(peg$currPos) === 32) {
+          s1 = peg$c47;
+          peg$currPos++;
+        } else {
+          s1 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c48); }
+        }
+      }
+    } else {
+      s0 = peg$FAILED;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c46); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsed() {
+    var s0, s1;
+
+    peg$silentFails++;
+    if (peg$c50.test(input.charAt(peg$currPos))) {
+      s0 = input.charAt(peg$currPos);
+      peg$currPos++;
+    } else {
+      s0 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c51); }
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c49); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsenumber() {
+    var s0, s1, s2;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = [];
+    s2 = peg$parsed();
+    if (s2 !== peg$FAILED) {
+      while (s2 !== peg$FAILED) {
+        s1.push(s2);
+        s2 = peg$parsed();
+      }
+    } else {
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c52); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseamount() {
+    var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$parsecurrencySymbol();
+    if (s1 === peg$FAILED) {
+      s1 = null;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      if (s2 !== peg$FAILED) {
+        s3 = peg$currPos;
+        s4 = peg$currPos;
+        s5 = [];
+        s6 = peg$parsed();
+        if (s6 !== peg$FAILED) {
+          while (s6 !== peg$FAILED) {
+            s5.push(s6);
+            s6 = peg$parsed();
+          }
+        } else {
+          s5 = peg$FAILED;
+        }
+        if (s5 !== peg$FAILED) {
+          s6 = peg$currPos;
+          if (input.charCodeAt(peg$currPos) === 46) {
+            s7 = peg$c54;
+            peg$currPos++;
+          } else {
+            s7 = peg$FAILED;
+            if (peg$silentFails === 0) { peg$fail(peg$c55); }
+          }
+          if (s7 !== peg$FAILED) {
+            s8 = peg$parsed();
+            if (s8 !== peg$FAILED) {
+              s9 = peg$parsed();
+              if (s9 !== peg$FAILED) {
+                s7 = [s7, s8, s9];
+                s6 = s7;
+              } else {
+                peg$currPos = s6;
+                s6 = peg$FAILED;
+              }
+            } else {
+              peg$currPos = s6;
+              s6 = peg$FAILED;
+            }
+          } else {
+            peg$currPos = s6;
+            s6 = peg$FAILED;
+          }
+          if (s6 === peg$FAILED) {
+            s6 = null;
+          }
+          if (s6 !== peg$FAILED) {
+            s5 = [s5, s6];
+            s4 = s5;
+          } else {
+            peg$currPos = s4;
+            s4 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s4;
+          s4 = peg$FAILED;
+        }
+        if (s4 !== peg$FAILED) {
+          s3 = input.substring(s3, peg$currPos);
+        } else {
+          s3 = s4;
+        }
+        if (s3 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$c56(s3);
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c53); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsepercent() {
+    var s0, s1, s2, s3;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = [];
+    s3 = peg$parsed();
+    if (s3 !== peg$FAILED) {
+      while (s3 !== peg$FAILED) {
+        s2.push(s3);
+        s3 = peg$parsed();
+      }
+    } else {
+      s2 = peg$FAILED;
+    }
+    if (s2 !== peg$FAILED) {
+      s1 = input.substring(s1, peg$currPos);
+    } else {
+      s1 = s2;
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parse_();
+      if (s2 === peg$FAILED) {
+        s2 = null;
+      }
+      if (s2 !== peg$FAILED) {
+        if (input.charCodeAt(peg$currPos) === 37) {
+          s3 = peg$c58;
+          peg$currPos++;
+        } else {
+          s3 = peg$FAILED;
+          if (peg$silentFails === 0) { peg$fail(peg$c59); }
+        }
+        if (s3 !== peg$FAILED) {
+          peg$savedPos = s0;
+          s1 = peg$c60(s1);
+          s0 = s1;
+        } else {
+          peg$currPos = s0;
+          s0 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c57); }
+    }
+
+    return s0;
+  }
+
+  function peg$parseyear() {
+    var s0, s1, s2, s3, s4, s5;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$parsed();
+    if (s2 !== peg$FAILED) {
+      s3 = peg$parsed();
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parsed();
+        if (s4 !== peg$FAILED) {
+          s5 = peg$parsed();
+          if (s5 !== peg$FAILED) {
+            s2 = [s2, s3, s4, s5];
+            s1 = s2;
+          } else {
+            peg$currPos = s1;
+            s1 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s1;
+          s1 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c61); }
+    }
+
+    return s0;
+  }
+
+  function peg$parsemonth() {
+    var s0, s1, s2, s3, s4, s5;
+
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$parseyear();
+    if (s2 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 45) {
+        s3 = peg$c63;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$c64); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parsed();
+        if (s4 !== peg$FAILED) {
+          s5 = peg$parsed();
+          if (s5 !== peg$FAILED) {
+            s2 = [s2, s3, s4, s5];
+            s1 = s2;
+          } else {
+            peg$currPos = s1;
+            s1 = peg$FAILED;
+          }
+        } else {
+          peg$currPos = s1;
+          s1 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c62); }
+    }
+
+    return s0;
   }
 
-  months.forEach(month => {
-    if (!meta.createdMonths.has(month)) {
-      let prevMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__["prevMonth"](month);
-
-      let _monthUtils$bounds2 = _shared_months__WEBPACK_IMPORTED_MODULE_0__["bounds"](month),
-          start = _monthUtils$bounds2.start,
-          end = _monthUtils$bounds2.end;
-
-      let sheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__["sheetForMonth"](month, budgetType);
-      let prevSheetName = _shared_months__WEBPACK_IMPORTED_MODULE_0__["sheetForMonth"](prevMonth, budgetType);
-      categories.forEach(cat => {
-        createCategory(cat, sheetName, prevSheetName, start, end);
-      });
-      groups.forEach(group => {
-        createCategoryGroup(group, sheetName);
-      });
+  function peg$parseday() {
+    var s0, s1, s2, s3;
 
-      if (budgetType === 'rollover') {
-        _rollover__WEBPACK_IMPORTED_MODULE_7__["createSummary"](groups, categories, prevSheetName, sheetName);
+    peg$silentFails++;
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$parsed();
+    if (s2 !== peg$FAILED) {
+      s3 = peg$parsed();
+      if (s3 !== peg$FAILED) {
+        s2 = [s2, s3];
+        s1 = s2;
       } else {
-        _report__WEBPACK_IMPORTED_MODULE_6__["createSummary"](groups, categories, sheetName);
+        peg$currPos = s1;
+        s1 = peg$FAILED;
       }
-
-      meta.createdMonths.add(month);
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c65); }
     }
-  });
-  _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().setMeta(meta);
-  _sheet__WEBPACK_IMPORTED_MODULE_3__["endTransaction"](); // Wait for the spreadsheet to finish computing. Normally this won't
-  // do anything (as values are cached) but on first run this need to
-  // show the loading screen while it initially sets up.
 
-  await _sheet__WEBPACK_IMPORTED_MODULE_3__["waitOnSpreadsheet"]();
-}
-async function createAllBudgets() {
-  let earliestTransaction = await _db__WEBPACK_IMPORTED_MODULE_2__["first"]('SELECT * FROM transactions WHERE isChild=0 AND date IS NOT NULL ORDER BY date ASC LIMIT 1');
-  let earliestDate = earliestTransaction && _db__WEBPACK_IMPORTED_MODULE_2__["fromDateRepr"](earliestTransaction.date);
-  let currentMonth = _shared_months__WEBPACK_IMPORTED_MODULE_0__["currentMonth"](); // Get the range based off of the earliest transaction and the
-  // current month. If no transactions currently exist the current
-  // month is also used as the starting month
+    return s0;
+  }
 
-  let _getBudgetRange = getBudgetRange(earliestDate || currentMonth, currentMonth),
-      start = _getBudgetRange.start,
-      end = _getBudgetRange.end,
-      range = _getBudgetRange.range;
+  function peg$parsedate() {
+    var s0, s1, s2, s3, s4;
 
-  let meta = _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().meta();
-  let createdMonths = meta.createdMonths || new Set();
-  let newMonths = range.filter(m => !createdMonths.has(m));
+    s0 = peg$currPos;
+    s1 = peg$currPos;
+    s2 = peg$parsemonth();
+    if (s2 !== peg$FAILED) {
+      if (input.charCodeAt(peg$currPos) === 45) {
+        s3 = peg$c63;
+        peg$currPos++;
+      } else {
+        s3 = peg$FAILED;
+        if (peg$silentFails === 0) { peg$fail(peg$c64); }
+      }
+      if (s3 !== peg$FAILED) {
+        s4 = peg$parseday();
+        if (s4 !== peg$FAILED) {
+          s2 = [s2, s3, s4];
+          s1 = s2;
+        } else {
+          peg$currPos = s1;
+          s1 = peg$FAILED;
+        }
+      } else {
+        peg$currPos = s1;
+        s1 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s1;
+      s1 = peg$FAILED;
+    }
+    if (s1 !== peg$FAILED) {
+      s0 = input.substring(s0, peg$currPos);
+    } else {
+      s0 = s1;
+    }
 
-  if (newMonths.length > 0) {
-    await createBudget(range);
+    return s0;
   }
 
-  return {
-    start,
-    end
-  };
-}
-async function setType(type) {
-  let meta = _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().meta();
+  function peg$parsecurrencySymbol() {
+    var s0, s1, s2;
 
-  if (type === meta.budgetType) {
-    return;
-  }
+    peg$silentFails++;
+    s0 = peg$currPos;
+    if (input.length > peg$currPos) {
+      s1 = input.charAt(peg$currPos);
+      peg$currPos++;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c67); }
+    }
+    if (s1 !== peg$FAILED) {
+      peg$savedPos = peg$currPos;
+      s2 = peg$c68(s1);
+      if (s2) {
+        s2 = void 0;
+      } else {
+        s2 = peg$FAILED;
+      }
+      if (s2 !== peg$FAILED) {
+        s1 = [s1, s2];
+        s0 = s1;
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+    peg$silentFails--;
+    if (s0 === peg$FAILED) {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$c66); }
+    }
 
-  meta.budgetType = type;
-  meta.createdMonths = new Set(); // Go through and force all the cells to be recomputed
+    return s0;
+  }
 
-  let nodes = _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().getNodes();
-  _db__WEBPACK_IMPORTED_MODULE_2__["transaction"](() => {
-    for (let name of nodes.keys()) {
-      let _name$split = name.split('!'),
-          _name$split2 = _slicedToArray(_name$split, 2),
-          sheetName = _name$split2[0],
-          cellName = _name$split2[1];
+  peg$result = peg$startRuleFunction();
 
-      if (sheetName.match(/^budget\d+/)) {
-        _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().deleteCell(sheetName, cellName);
-      }
+  if (peg$result !== peg$FAILED && peg$currPos === input.length) {
+    return peg$result;
+  } else {
+    if (peg$result !== peg$FAILED && peg$currPos < input.length) {
+      peg$fail(peg$endExpectation());
     }
-  });
-  _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().startCacheBarrier();
-  _sheet__WEBPACK_IMPORTED_MODULE_3__["loadUserBudgets"](_db__WEBPACK_IMPORTED_MODULE_2__);
-  let bounds = await createAllBudgets();
-  _sheet__WEBPACK_IMPORTED_MODULE_3__["get"]().endCacheBarrier();
-  return bounds;
+
+    throw peg$buildStructuredError(
+      peg$maxFailExpected,
+      peg$maxFailPos < input.length ? input.charAt(peg$maxFailPos) : null,
+      peg$maxFailPos < input.length
+        ? peg$computeLocation(peg$maxFailPos, peg$maxFailPos + 1)
+        : peg$computeLocation(peg$maxFailPos, peg$maxFailPos)
+    );
+  }
 }
 
+module.exports = {
+  SyntaxError: peg$SyntaxError,
+  parse:       peg$parse
+};
+
+
 /***/ }),
 
 /***/ "./packages/loot-core/src/server/budget/goaltemplates.js":
@@ -49743,24 +51297,28 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _shared_util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../shared/util */ "./packages/loot-core/src/shared/util.js");
 /* harmony import */ var _db__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../db */ "./packages/loot-core/src/server/db/index.js");
 /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./actions */ "./packages/loot-core/src/server/budget/actions.js");
+/* harmony import */ var _goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./goal-template.pegjs */ "./packages/loot-core/src/server/budget/goal-template.pegjs");
+/* harmony import */ var _goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5__);
 
 
 
 
 
-async function applyTemplate({
+
+function applyTemplate({
   month
 }) {
-  await processTemplate(month, false);
+  return processTemplate(month, false);
 }
-async function overwriteTemplate({
+function overwriteTemplate({
   month
 }) {
-  await processTemplate(month, true);
+  return processTemplate(month, true);
 }
 
 async function processTemplate(month, force) {
   let category_templates = await getCategoryTemplates();
+  let errors = [];
   let categories = await _db__WEBPACK_IMPORTED_MODULE_3__["all"]('SELECT * FROM v_categories WHERE tombstone = 0');
   let num_applied = 0;
 
@@ -49772,6 +51330,10 @@ async function processTemplate(month, force) {
       let template = category_templates[category.id];
 
       if (template) {
+        errors = errors.concat(template.filter(t => t.type === 'error').map(({
+          line,
+          error
+        }) => [category.name + ': ' + error.message, line, ' '.repeat(TEMPLATE_PREFIX.length + error.location.start.offset) + '^'].join('\n')));
         let to_budget = await applyCategoryTemplate(category, template, month, force);
 
         if (to_budget != null) {
@@ -49787,122 +51349,61 @@ async function processTemplate(month, force) {
   }
 
   if (num_applied === 0) {
-    console.log('All categories were up to date.');
+    if (errors.length) {
+      return {
+        type: 'error',
+        sticky: true,
+        message: `There were errors interpreting some templates:`,
+        pre: errors.join('\n\n')
+      };
+    } else {
+      return {
+        type: 'message',
+        message: 'All categories were up to date.'
+      };
+    }
   } else {
-    console.log(`${num_applied} categories updated.`);
+    let applied = `Successfully applied templates to ${num_applied} ${num_applied === 1 ? 'category' : 'categories'}.`;
+
+    if (errors.length) {
+      return {
+        sticky: true,
+        message: `${applied} There were errors interpreting some templates:`,
+        pre: errors.join('\n\n')
+      };
+    } else {
+      return {
+        type: 'message',
+        message: applied
+      };
+    }
   }
 }
 
+const TEMPLATE_PREFIX = '#template ';
+
 async function getCategoryTemplates() {
-  const matches = [{
-    type: 'simple',
-    re: /^#template \$?(\-?\d+(\.\d{2})?)$/im,
-    //eslint-disable-line
-    params: ['monthly']
-  }, {
-    type: 'simple',
-    re: /^#template up to \$?(\d+(\.\d{2})?)$/im,
-    params: ['limit']
-  }, {
-    type: 'simple',
-    re: /^#template \$?(\d+(\.\d{2})?) up to \$?(\d+(\.\d{2})?)$/im,
-    params: ['monthly', null, 'limit']
-  }, {
-    type: 'by',
-    re: /^#template \$?(\d+(\.\d{2})?) by (\d{4}\-\d{2})$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'month']
-  }, {
-    type: 'by',
-    re: /^#template \$?(\d+(\.\d{2})?) by (\d{4}\-\d{2}) repeat every (\d+) months$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'month', 'repeat']
-  }, {
-    type: 'week',
-    re: /^#template \$?(\d+(\.\d{2})?) repeat every week starting (\d{4}\-\d{2}\-\d{2})$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'starting']
-  }, {
-    type: 'week',
-    re: /^#template \$?(\d+(\.\d{2})?) repeat every week starting (\d{4}\-\d{2}\-\d{2}) up to \$?(\d+(\.\d{2})?)$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'starting', 'limit']
-  }, {
-    type: 'weeks',
-    re: /^#template \$?(\d+(\.\d{2})?) repeat every (\d+) weeks starting (\d{4}\-\d{2}\-\d{2})$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'weeks', 'starting']
-  }, {
-    type: 'weeks',
-    re: /^#template \$?(\d+(\.\d{2})?) repeat every (\d+) weeks starting (\d{4}\-\d{2}\-\d{2}) up to \$?(\d+(\.\d{2})?)$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'weeks', 'starting', 'limit']
-  }, {
-    type: 'by_annual',
-    re: /^#template \$?(\d+(\.\d{2})?) by (\d{4}\-\d{2}) repeat every year$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'month']
-  }, {
-    type: 'by_annual',
-    re: /^#template \$?(\d+(\.\d{2})?) by (\d{4}\-\d{2}) repeat every (\d+) years$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'month', 'repeat']
-  }, {
-    type: 'spend',
-    re: /^#template \$?(\d+(\.\d{2})?) by (\d{4}\-\d{2}) spend from (\d{4}\-\d{2})$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'month', 'from']
-  }, {
-    type: 'spend',
-    re: /^#template \$?(\d+(\.\d{2})?) by (\d{4}\-\d{2}) spend from (\d{4}\-\d{2}) repeat every (\d+) months$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'month', 'from', 'repeat']
-  }, {
-    type: 'spend_annual',
-    re: /^#template \$?(\d+(\.\d{2})?) by (\d{4}\-\d{2}) spend from (\d{4}\-\d{2}) repeat every year$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'month', 'from']
-  }, {
-    type: 'spend_annual',
-    re: /^#template \$?(\d+(\.\d{2})?) by (\d{4}\-\d{2}) spend from (\d{4}\-\d{2}) repeat every (\d+) years$/im,
-    //eslint-disable-line
-    params: ['amount', null, 'month', 'from', 'repeat']
-  }, {
-    type: 'percentage',
-    re: /^#template (\d+(\.\d+)?)% of (.*)$/im,
-    params: ['percent', null, 'category']
-  }, {
-    type: 'error',
-    re: /^#template .*$/im,
-    params: []
-  }];
   let templates = {};
-  let notes = await _db__WEBPACK_IMPORTED_MODULE_3__["all"](`SELECT * FROM notes WHERE note like '%#template%'`);
+  let notes = await _db__WEBPACK_IMPORTED_MODULE_3__["all"](`SELECT * FROM notes WHERE lower(note) like '%${TEMPLATE_PREFIX}%'`);
 
   for (let n = 0; n < notes.length; n++) {
     let lines = notes[n].note.split('\n');
     let template_lines = [];
 
     for (let l = 0; l < lines.length; l++) {
-      for (let m = 0; m < matches.length; m++) {
-        let arr = matches[m].re.exec(lines[l]);
-
-        if (arr) {
-          let matched = {};
-          matched.line = arr[0];
-          matched.type = matches[m].type;
-
-          for (let p = 0; p < matches[m].params.length; p++) {
-            let param_name = matches[m].params[p];
-
-            if (param_name) {
-              matched[param_name] = arr[p + 1];
-            }
-          }
+      let line = lines[l].trim();
+      if (!line.toLowerCase().startsWith(TEMPLATE_PREFIX)) continue;
+      let expression = line.slice(TEMPLATE_PREFIX.length);
 
-          template_lines.push(matched);
-          break;
-        }
+      try {
+        let parsed = Object(_goal_template_pegjs__WEBPACK_IMPORTED_MODULE_5__["parse"])(expression);
+        template_lines.push(parsed);
+      } catch (e) {
+        template_lines.push({
+          type: 'error',
+          line,
+          error: e
+        });
       }
     }
 
@@ -49922,15 +51423,13 @@ async function applyCategoryTemplate(category, template_lines, month, force) {
     //debugger;
     switch (template.type) {
       case 'by':
-      case 'by_annual':
       case 'spend':
-      case 'spend_annual':
         let target_month = new Date(`${template.month}-01`);
         let num_months = Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["differenceInCalendarMonths"])(target_month, current_month);
-        let repeat = template.type.includes('annual') ? (template.repeat || 1) * 12 : template.repeat;
+        let repeat = template.annual ? (template.repeat || 1) * 12 : template.repeat;
         let spend_from;
 
-        if (template.type.includes('spend')) {
+        if (template.type === 'spend') {
           spend_from = new Date(`${template.from}-01`);
         }
 
@@ -49965,13 +51464,13 @@ async function applyCategoryTemplate(category, template_lines, month, force) {
 
   if (template_lines.length > 1) {
     template_lines = template_lines.sort((a, b) => {
-      if (a.type.slice(0, 2) === b.type.slice(0, 2) && a.type.slice(0, 2) === 'by') {
+      if (a.type === 'by' && !a.annual) {
         return Object(date_fns__WEBPACK_IMPORTED_MODULE_0__["differenceInCalendarMonths"])(new Date(`${a.month}-01`), new Date(`${b.month}-01`));
       } else {
         return a.type.localeCompare(b.type);
       }
     }).filter(el => {
-      if (el.type.slice(0, 2) === 'by') {
+      if (el.type === 'by') {
         if (!got_by) {
           got_by = true;
           return el;
@@ -50019,7 +51518,6 @@ async function applyCategoryTemplate(category, template_lines, month, force) {
         }
 
       case 'by':
-      case 'by_annual':
         {
           // by has 'amount' and 'month' params
           let target_month = new Date(`${template.month}-01`);
@@ -50042,10 +51540,8 @@ async function applyCategoryTemplate(category, template_lines, month, force) {
         }
 
       case 'week':
-      case 'weeks':
         {
-          // weeks has 'amount', 'starting' and optional 'limit' params
-          // weeks has 'amount', 'starting', 'weeks' and optional 'limit' params
+          // week has 'amount', 'starting', 'weeks' and optional 'limit' params
           let amount = Object(_shared_util__WEBPACK_IMPORTED_MODULE_2__["amountToInteger"])(template.amount);
           let weeks = template.weeks != null ? Math.round(template.weeks) : 1;
 
@@ -50073,7 +51569,6 @@ async function applyCategoryTemplate(category, template_lines, month, force) {
         }
 
       case 'spend':
-      case 'spend_annual':
         {
           // spend has 'amount' and 'from' and 'month' params
           let from_month = new Date(`${template.from}-01`);
@@ -50129,7 +51624,6 @@ async function applyCategoryTemplate(category, template_lines, month, force) {
         }
 
       case 'error':
-        console.log(`${category.name}: ${`Failed to match:`} ${template.line}`);
         return null;
 
       default:
@@ -53507,7 +55001,7 @@ handlers['account-create'] = Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["mut
       transfer_acct: id
     });
 
-    if (balance != null) {
+    if (balance != null && balance !== 0) {
       let payee = await Object(_accounts_payees__WEBPACK_IMPORTED_MODULE_16__["getStartingBalancePayee"])();
       await _db__WEBPACK_IMPORTED_MODULE_28__["insertTransaction"]({
         account: id,
@@ -53748,7 +55242,7 @@ handlers['accounts-sync'] = async function ({
         } else {
           errors.push({
             accountId: acct.id,
-            message: 'There was an internal error. Please email help@actualbudget.com for support.',
+            message: 'There was an internal error. Please get in touch https://actualbudget.github.io/docs/Contact for support.',
             internal: err.stack
           });
           err.message = 'Failed syncing account: ' + err.message;
@@ -54064,22 +55558,13 @@ handlers['key-test'] = async function ({
   return {};
 };
 
-handlers['should-pitch-subscribe'] = async function () {
-  let seenSubscribe = await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.getItem('seenSubscribe');
-  return seenSubscribe !== 'true';
-};
-
-handlers['has-pitched-subscribe'] = async function () {
-  await _platform_server_asyncStorage__WEBPACK_IMPORTED_MODULE_4___default.a.setItem('seenSubscribe', 'true');
-  return 'ok';
-};
-
 handlers['subscribe-needs-bootstrap'] = async function ({
   url
 } = {}) {
   if (Object(_server_config__WEBPACK_IMPORTED_MODULE_39__["getServer"])(url).BASE_SERVER === UNCONFIGURED_SERVER) {
     return {
-      bootstrapped: true
+      bootstrapped: true,
+      hasServer: false
     };
   }
 
@@ -54108,7 +55593,8 @@ handlers['subscribe-needs-bootstrap'] = async function ({
   }
 
   return {
-    bootstrapped: res.data.bootstrapped
+    bootstrapped: res.data.bootstrapped,
+    hasServer: true
   };
 };
 
@@ -54256,19 +55742,22 @@ handlers['get-server-url'] = async function () {
 };
 
 handlers['set-server-url'] = async function ({
-  url
+  url,
+  validate = true
 }) {
   if (url != null) {
-    // Validate the server is running
-    let _await$runHandler = await Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["runHandler"])(handlers['subscribe-needs-bootstrap'], {
-      url
-    }),
-        error = _await$runHandler.error;
+    if (validate) {
+      // Validate the server is running
+      let _await$runHandler = await Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["runHandler"])(handlers['subscribe-needs-bootstrap'], {
+        url
+      }),
+          error = _await$runHandler.error;
 
-    if (error) {
-      return {
-        error
-      };
+      if (error) {
+        return {
+          error
+        };
+      }
     }
   } else {
     // When the server isn't configured, we just use a placeholder
@@ -54408,26 +55897,31 @@ handlers['download-budget'] = async function ({
     }
   }
 
-  let id = result.id; // Load the budget and do a full sync
-
-  result = await loadBudget(result.id, VERSION, {
-    showUpdate: true
+  let id = result.id;
+  await handlers['load-budget']({
+    id
   });
+  result = await handlers['sync-budget']({
+    id
+  });
+  await handlers['close-budget']();
 
   if (result.error) {
-    return {
-      error: {
-        reason: result.error
-      }
-    };
+    return result;
   }
 
-  Object(_sync__WEBPACK_IMPORTED_MODULE_41__["setSyncingMode"])('enabled');
-  await Object(_sync__WEBPACK_IMPORTED_MODULE_41__["initialFullSync"])();
-  await handlers['close-budget']();
   return {
     id
   };
+}; // open and sync, but don’t close
+
+
+handlers['sync-budget'] = async function ({
+  id
+}) {
+  Object(_sync__WEBPACK_IMPORTED_MODULE_41__["setSyncingMode"])('enabled');
+  await Object(_sync__WEBPACK_IMPORTED_MODULE_41__["initialFullSync"])();
+  return {};
 };
 
 handlers['load-budget'] = async function ({
@@ -54992,10 +56486,7 @@ async function initApp(version, isDev, socketName) {
     global.$setSyncingMode = _sync__WEBPACK_IMPORTED_MODULE_41__["setSyncingMode"];
   }
 }
-async function init({
-  budgetId,
-  config
-}) {
+async function init(config) {
   // Get from build
   // eslint-disable-next-line
   VERSION = "0.0.147";
@@ -55018,6 +56509,12 @@ async function init({
 
   if (serverURL) {
     Object(_server_config__WEBPACK_IMPORTED_MODULE_39__["setServer"])(serverURL);
+
+    if (config.password) {
+      await Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["runHandler"])(handlers['subscribe-sign-in'], {
+        password: config.password
+      });
+    }
   } else {
     // This turns off all server URLs. In this mode we don't want any
     // access to the server, we are doing things locally
@@ -55027,12 +56524,6 @@ async function init({
     });
   }
 
-  if (budgetId) {
-    await Object(_mutators__WEBPACK_IMPORTED_MODULE_33__["runHandler"])(handlers['load-budget'], {
-      id: budgetId
-    });
-  }
-
   return lib;
 } // Export a few things required for the platform
 
@@ -57419,7 +58910,7 @@ class Spreadsheet {
           result = node._run(...args);
 
           if (result instanceof Promise) {
-            console.warn('dynamic cell returned a promise! this is discouraged because errors are not handled properly');
+            console.warn(`dynamic cell ${name} returned a promise! this is discouraged because errors are not handled properly`);
           }
         } else if (node.sql) {
           result = Object(_aql__WEBPACK_IMPORTED_MODULE_1__["runCompiledQuery"])(node.query, node.sql.sqlPieces, node.sql.state);
@@ -58088,9 +59579,9 @@ function apply(msg, prev) {
 
   if (dataset === 'prefs') {// Do nothing, it doesn't exist in the db
   } else {
-    try {
-      let query;
+    let query;
 
+    try {
       if (prev) {
         query = {
           sql: _db__WEBPACK_IMPORTED_MODULE_7__["cache"](`UPDATE ${dataset} SET ${column} = ? WHERE id = ?`),
@@ -58104,9 +59595,14 @@ function apply(msg, prev) {
       }
 
       _db__WEBPACK_IMPORTED_MODULE_7__["runQuery"](query.sql, query.params);
-    } catch (e) {
-      //console.log(e);
-      throw new SyncError('invalid-schema');
+    } catch (error) {
+      throw new SyncError('invalid-schema', {
+        error: {
+          message: error.message,
+          stack: error.stack
+        },
+        query
+      });
     }
   }
 }
@@ -58139,8 +59635,12 @@ async function fetchAll(table, ids) {
     try {
       let rows = await _db__WEBPACK_IMPORTED_MODULE_7__["runQuery"](sql, partIds, true);
       results = results.concat(rows);
-    } catch (e) {
-      throw new SyncError('invalid-schema');
+    } catch (error) {
+      throw new SyncError('invalid-schema', {
+        error,
+        sql,
+        params: partIds
+      });
     }
   }
 
@@ -58417,11 +59917,13 @@ async function _sendMessages(messages) {
         // message.
         _main_app__WEBPACK_IMPORTED_MODULE_8__["default"].events.emit('sync', {
           type: 'error',
-          subtype: 'apply-failure'
+          subtype: 'apply-failure',
+          meta: e.meta
         });
       } else {
         _main_app__WEBPACK_IMPORTED_MODULE_8__["default"].events.emit('sync', {
-          type: 'error'
+          type: 'error',
+          meta: e.meta
         });
       }
     }
@@ -61112,6 +62614,129 @@ function once(fn) {
 
 /***/ }),
 
+/***/ "./packages/loot-core/src/shared/errors.js":
+/*!*************************************************!*\
+  !*** ./packages/loot-core/src/shared/errors.js ***!
+  \*************************************************/
+/*! exports provided: getUploadError, getDownloadError, getCreateKeyError, getTestKeyError, getSubscribeError, getSyncError */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getUploadError", function() { return getUploadError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDownloadError", function() { return getDownloadError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getCreateKeyError", function() { return getCreateKeyError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getTestKeyError", function() { return getTestKeyError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSubscribeError", function() { return getSubscribeError; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getSyncError", function() { return getSyncError; });
+function getUploadError({
+  reason,
+  meta
+}) {
+  switch (reason) {
+    case 'unauthorized':
+      return 'You are not logged in.';
+
+    case 'encrypt-failure':
+      if (meta.isMissingKey) {
+        return 'Encrypting your file failed because you are missing your encryption key. Create your key in the next step.';
+      }
+
+      return 'Encrypting the file failed. You have the correct key so this is an internal bug. To fix this, generate a new key in the next step.';
+
+    case 'file-has-reset':
+      // Something really weird happened - during reset a sanity
+      // check on the server failed. The user just needs to
+      // restart the whole process.
+      return 'Something went wrong while resetting your file. Please try again.';
+
+    case 'file-has-new-key':
+      return 'Unable to encrypt your data because you are missing the key. Create the latest key in the next step.';
+
+    case 'network':
+      return 'Uploading the file failed. Check your network connection.';
+
+    case 'beta-version':
+      return 'You cannot perform this action in the beta version (resetting sync, deleting a file, etc).';
+
+    default:
+      return `An internal error occurred, sorry! Contact help@actualbudget.com for support. (ref: ${reason})`;
+  }
+}
+function getDownloadError({
+  reason,
+  meta,
+  fileName
+}) {
+  switch (reason) {
+    case 'network':
+    case 'download-failure':
+      return 'Downloading the file failed. Check your network connection.';
+
+    case 'invalid-zip-file':
+    case 'invalid-meta-file':
+      return 'Downloaded file is invalid, sorry! Contact help@actualbudget.com for support.';
+
+    case 'decrypt-failure':
+      return 'Unable to decrypt file ' + (fileName || '(unknown)') + '. To change your key, first ' + 'download this file with the proper password.';
+
+    case 'out-of-sync-migrations':
+      return 'This budget cannot be loaded with this version of the app. ' + 'Make sure the app is up-to-date.';
+
+    default:
+      let info = meta && meta.fileId ? `(fileId: ${meta.fileId})` : '';
+      return 'Something went wrong trying to download that file, sorry! Contact help@actualbudget.com for support. ' + info;
+  }
+}
+function getCreateKeyError(error) {
+  return getUploadError(error);
+}
+function getTestKeyError({
+  reason
+}) {
+  switch (reason) {
+    case 'network':
+      return 'Unable to connect to the server. We need to access our server to get some information about your keys.';
+
+    case 'old-key-style':
+      return 'This file is encrypted with an old unsupported key style. Recreate the key ' + 'on a device where the file is available, or use an older version of Actual to download ' + 'it.';
+
+    case 'decrypt-failure':
+      return 'Unable to decrypt file with this password. Please try again.';
+
+    default:
+      return 'Something went wrong trying to create a key, sorry! Contact help@actualbudget.com for support.';
+  }
+}
+function getSubscribeError({
+  reason
+}) {
+  switch (reason) {
+    case 'network':
+      return 'Unable to reach the server. Check your internet connection';
+
+    case 'exists':
+      return 'An account with that email already exists. Did you mean to login?';
+
+    case 'invalid-email':
+      return 'Invalid email';
+
+    default:
+      return 'An error occurred. Please try again later.';
+  }
+}
+function getSyncError(error, id) {
+  if (error === 'out-of-sync-migrations' || error === 'out-of-sync-data') {
+    return 'This budget cannot be loaded with this version of the app.';
+  } else if (error === 'budget-not-found') {
+    return 'Budget "' + id + '" not found. Check the id of your budget in the "Advanced" section of the settings page.';
+  } else {
+    return 'We had an unknown problem opening "' + id + '".';
+  }
+}
+
+/***/ }),
+
 /***/ "./packages/loot-core/src/shared/months.js":
 /*!*************************************************!*\
   !*** ./packages/loot-core/src/shared/months.js ***!
@@ -61774,7 +63399,7 @@ function getFieldError(type) {
       return 'Please choose a valid field for this type of rule';
 
     default:
-      return 'Internal error, sorry! Contact help@actualbudget.com';
+      return 'Internal error, sorry! Please get in touch https://actualbudget.github.io/docs/Contact/ for support';
   }
 }
 function sortNumbers(num1, num2) {
@@ -61790,7 +63415,7 @@ function parse(item) {
       {
         let parsed = item.value;
 
-        if (item.field === 'amount' && item.op !== 'isbetween') {
+        if (item.field === 'amount' && item.op !== 'isbetween' && parsed != null) {
           parsed = Object(_util__WEBPACK_IMPORTED_MODULE_0__["integerToAmount"])(parsed);
         }
 
@@ -61869,7 +63494,7 @@ function makeValue(value, cond) {
         if (cond.op !== 'isbetween') {
           return _objectSpread(_objectSpread({}, cond), {}, {
             error: null,
-            value: value ? Object(_util__WEBPACK_IMPORTED_MODULE_0__["currencyToAmount"])(value) || 0 : 0
+            value: value ? Object(_util__WEBPACK_IMPORTED_MODULE_0__["currencyToAmount"])(String(value)) || 0 : 0
           });
         }