A local-first personal finance app
Enable linting for all packages (#861)
Jed Fox5d559afe3043
diff --git a/package.json b/package.jsonindex 37e3d139d0..98092fd3a8 100644--- a/package.json+++ b/package.json@@ -25,6 +25,7 @@"start:browser": "npm-run-all --parallel 'start:browser-*'","start:browser-backend": "yarn workspace loot-core watch:browser","start:browser-frontend": "yarn workspace @actual-app/web start:browser",+ "build:browser": "./bin/package-browser","test": "yarn workspaces foreach --parallel --verbose run test","test:debug": "yarn workspaces foreach --verbose run test","e2e": "yarn workspaces foreach --parallel --verbose run e2e",@@ -36,7 +37,7 @@},"devDependencies": {"cross-env": "^5.1.5",- "eslint": "8.35.0",+ "eslint": "^8.37.0","eslint-config-react-app": "7.0.1","eslint-plugin-prettier": "4.2.1","eslint-plugin-rulesdir": "^0.2.2",diff --git a/packages/api/.eslintignore b/packages/api/.eslintignorenew file mode 100644index 0000000000..d7b240adea--- /dev/null+++ b/packages/api/.eslintignore@@ -0,0 +1 @@+app/bundle.api.jsdiff --git a/packages/api/app/query.js b/packages/api/app/query.jsindex 41aab535ce..0c0d5f5b08 100644--- a/packages/api/app/query.js+++ b/packages/api/app/query.js@@ -11,14 +11,14 @@ class Query {validateRefs: true,limit: null,offset: null,- ...state+ ...state,};}filter(expr) {return new Query({...this.state,- filterExpressions: [...this.state.filterExpressions, expr]+ filterExpressions: [...this.state.filterExpressions, expr],});}@@ -27,8 +27,8 @@ class Query {return new Query({...this.state,filterExpressions: this.state.filterExpressions.filter(- expr => !exprSet.has(Object.keys(expr)[0])- )+ expr => !exprSet.has(Object.keys(expr)[0]),+ ),});}@@ -55,7 +55,7 @@ class Query {return new Query({...this.state,- groupExpressions: [...this.state.groupExpressions, ...exprs]+ groupExpressions: [...this.state.groupExpressions, ...exprs],});}@@ -66,7 +66,7 @@ class Query {return new Query({...this.state,- orderExpressions: [...this.state.orderExpressions, ...exprs]+ orderExpressions: [...this.state.orderExpressions, ...exprs],});}@@ -99,24 +99,6 @@ class Query {}}-function getPrimaryOrderBy(query, defaultOrderBy) {- let orderExprs = query.serialize().orderExpressions;- if (orderExprs.length === 0) {- if (defaultOrderBy) {- return { order: 'asc', ...defaultOrderBy };- }- return null;- }-- let firstOrder = orderExprs[0];- if (typeof firstOrder === 'string') {- return { field: firstOrder, order: 'asc' };- }- // Handle this form: { field: 'desc' }- let [field] = Object.keys(firstOrder);- return { field, order: firstOrder[field] };-}-module.exports = function q(table) {return new Query({ table });};diff --git a/packages/api/methods.js b/packages/api/methods.jsindex 816f90bb58..1a01cfce46 100644--- a/packages/api/methods.js+++ b/packages/api/methods.js@@ -105,10 +105,6 @@ function deleteAccount(id) {return send('api/account-delete', { id });}-function getCategoryGroups() {- return send('api/categories-get', { grouped: true });-}-function createCategoryGroup(group) {return send('api/category-group-create', { group });}diff --git a/packages/api/migrations/1632571489012_remove_cache.js b/packages/api/migrations/1632571489012_remove_cache.jsindex 1993e3d6b6..2f3764c47d 100644--- a/packages/api/migrations/1632571489012_remove_cache.js+++ b/packages/api/migrations/1632571489012_remove_cache.js@@ -6,7 +6,7 @@ export default async function runMigration(db, uuid) {db.execQuery(`CREATE TABLE zero_budget_months(id TEXT PRIMARY KEY,- buffered INTEGER DEFAULT 0);+ buffered INTEGER DEFAULT 0);CREATE TABLE zero_budgets(id TEXT PRIMARY KEY,@@ -34,12 +34,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let budget = db.runQuery(`SELECT * FROM spreadsheet_cells WHERE name LIKE 'budget%!budget-%'`,[],- true+ true,);db.transaction(() => {- budget.map(monthBudget => {+ budget.forEach(monthBudget => {let match = monthBudget.name.match(- /^(budget-report|budget)(\d+)!budget-(.+)$/+ /^(budget-report|budget)(\d+)!budget-(.+)$/,);if (match == null) {console.log('Warning: invalid budget month name', monthBudget.name);@@ -60,7 +60,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let carryover = db.runQuery('SELECT * FROM spreadsheet_cells WHERE name = ?',[`${sheetName}!carryover-${cat}`],- true+ true,);let table = type === 'budget-report' ? 'reflect_budgets' : 'zero_budgets';@@ -71,8 +71,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);dbmonth,cat,amount,- carryover.length > 0 && getValue(carryover[0]) === 'true' ? 1 : 0- ]+ carryover.length > 0 && getValue(carryover[0]) === 'true' ? 1 : 0,+ ],);});});@@ -81,10 +81,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let buffers = db.runQuery(`SELECT * FROM spreadsheet_cells WHERE name LIKE 'budget%!buffered'`,[],- true+ true,);db.transaction(() => {- buffers.map(buffer => {+ buffers.forEach(buffer => {let match = buffer.name.match(/^budget(\d+)!buffered$/);if (match) {let month = match[1].slice(0, 4) + '-' + match[1].slice(4);@@ -95,7 +95,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);db.runQuery(`INSERT INTO zero_budget_months (id, buffered) VALUES (?, ?)`,- [month, amount]+ [month, amount],);}});@@ -105,7 +105,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let notes = db.runQuery(`SELECT * FROM spreadsheet_cells WHERE name LIKE 'notes!%'`,[],- true+ true,);let parseNote = str => {diff --git a/packages/api/package.json b/packages/api/package.jsonindex baeb191a20..8737d112da 100644--- a/packages/api/package.json+++ b/packages/api/package.json@@ -14,6 +14,7 @@"utils.js"],"scripts": {+ "lint": "eslint .","build": "yarn workspace loot-core build:api"},"dependencies": {diff --git a/packages/desktop-client/.eslintignore b/packages/desktop-client/.eslintignoreindex c07b30d0a5..e4e895c18a 100644--- a/packages/desktop-client/.eslintignore+++ b/packages/desktop-client/.eslintignore@@ -1 +1,3 @@-bundle.browser.js\ No newline at end of file+bundle.browser.js+build/+public/kcab/diff --git a/packages/desktop-client/e2e/budget.test.js b/packages/desktop-client/e2e/budget.test.jsindex 95da06367e..6b3a8da28b 100644--- a/packages/desktop-client/e2e/budget.test.js+++ b/packages/desktop-client/e2e/budget.test.js@@ -5,7 +5,7 @@ import { Navigation } from './page-models/navigation';test.describe('Budget', () => {let page;- let navigation;+ let navigation; // eslint-disable-line no-unused-varslet configurationPage;let budgetPage;diff --git a/packages/desktop-client/e2e/onboarding.test.js b/packages/desktop-client/e2e/onboarding.test.jsindex b697852beb..4b20e66f86 100644--- a/packages/desktop-client/e2e/onboarding.test.js+++ b/packages/desktop-client/e2e/onboarding.test.js@@ -1,4 +1,5 @@import path from 'path';+import { test, expect } from '@playwright/test';import { AccountPage } from './page-models/account-page';@@ -69,7 +70,7 @@ test.describe('Onboarding', () => {await expect(accountPage.accountBalance).toHaveText('0.00');});- test('navigates back to start page by clicking on "no server" in an empty budget file', async () => {+ test('navigates back to start page by clicking on “no server” in an empty budget file', async () => {await configurationPage.clickOnNoServer();await configurationPage.startFresh();diff --git a/packages/desktop-client/e2e/transactions.test.js b/packages/desktop-client/e2e/transactions.test.jsindex 5c96ca63de..ed6be9e058 100644--- a/packages/desktop-client/e2e/transactions.test.js+++ b/packages/desktop-client/e2e/transactions.test.js@@ -31,7 +31,7 @@ test.describe('Transactions', () => {payee: 'Home Depot',notes: 'Notes field',category: 'Food',- debit: '12.34'+ debit: '12.34',});expect(await accountPage.getNthTransaction(0)).toMatchObject({@@ -39,7 +39,7 @@ test.describe('Transactions', () => {notes: 'Notes field',category: 'Food',debit: '12.34',- credit: ''+ credit: '',});});@@ -48,15 +48,15 @@ test.describe('Transactions', () => {{payee: 'Krogger',notes: 'Notes',- debit: '333.33'+ debit: '333.33',},{category: 'General',- debit: '222.22'+ debit: '222.22',},{- debit: '111.11'- }+ debit: '111.11',+ },]);expect(await accountPage.getNthTransaction(0)).toMatchObject({@@ -64,21 +64,21 @@ test.describe('Transactions', () => {notes: 'Notes',category: 'Split',debit: '333.33',- credit: ''+ credit: '',});expect(await accountPage.getNthTransaction(1)).toMatchObject({payee: 'Krogger',notes: '',category: 'General',debit: '222.22',- credit: ''+ credit: '',});expect(await accountPage.getNthTransaction(2)).toMatchObject({payee: 'Krogger',notes: '',category: 'Categorize',debit: '111.11',- credit: ''+ credit: '',});});});diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.jsonindex c29b928d7f..bdbe7ecbb6 100644--- a/packages/desktop-client/package.json+++ b/packages/desktop-client/package.json@@ -26,7 +26,6 @@"date-fns": "^2.29.3","debounce": "^1.2.0","downshift": "1.31.16",- "eslint": "^8.35.0","focus-visible": "^4.1.1","formik": "^0.11.10","glamor": "^2.20.40",@@ -68,7 +67,7 @@"build:browser": "cross-env ./bin/build-browser","test": "react-app-rewired test","e2e": "npx playwright test e2e --browser=chromium",- "lint": "eslint src"+ "lint": "eslint ."},"jest": {"setupFilesAfterEnv": [diff --git a/packages/desktop-client/public/data/migrations/1632571489012_remove_cache.js b/packages/desktop-client/public/data/migrations/1632571489012_remove_cache.jsindex 1993e3d6b6..2f3764c47d 100644--- a/packages/desktop-client/public/data/migrations/1632571489012_remove_cache.js+++ b/packages/desktop-client/public/data/migrations/1632571489012_remove_cache.js@@ -6,7 +6,7 @@ export default async function runMigration(db, uuid) {db.execQuery(`CREATE TABLE zero_budget_months(id TEXT PRIMARY KEY,- buffered INTEGER DEFAULT 0);+ buffered INTEGER DEFAULT 0);CREATE TABLE zero_budgets(id TEXT PRIMARY KEY,@@ -34,12 +34,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let budget = db.runQuery(`SELECT * FROM spreadsheet_cells WHERE name LIKE 'budget%!budget-%'`,[],- true+ true,);db.transaction(() => {- budget.map(monthBudget => {+ budget.forEach(monthBudget => {let match = monthBudget.name.match(- /^(budget-report|budget)(\d+)!budget-(.+)$/+ /^(budget-report|budget)(\d+)!budget-(.+)$/,);if (match == null) {console.log('Warning: invalid budget month name', monthBudget.name);@@ -60,7 +60,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let carryover = db.runQuery('SELECT * FROM spreadsheet_cells WHERE name = ?',[`${sheetName}!carryover-${cat}`],- true+ true,);let table = type === 'budget-report' ? 'reflect_budgets' : 'zero_budgets';@@ -71,8 +71,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);dbmonth,cat,amount,- carryover.length > 0 && getValue(carryover[0]) === 'true' ? 1 : 0- ]+ carryover.length > 0 && getValue(carryover[0]) === 'true' ? 1 : 0,+ ],);});});@@ -81,10 +81,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let buffers = db.runQuery(`SELECT * FROM spreadsheet_cells WHERE name LIKE 'budget%!buffered'`,[],- true+ true,);db.transaction(() => {- buffers.map(buffer => {+ buffers.forEach(buffer => {let match = buffer.name.match(/^budget(\d+)!buffered$/);if (match) {let month = match[1].slice(0, 4) + '-' + match[1].slice(4);@@ -95,7 +95,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);db.runQuery(`INSERT INTO zero_budget_months (id, buffered) VALUES (?, ?)`,- [month, amount]+ [month, amount],);}});@@ -105,7 +105,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let notes = db.runQuery(`SELECT * FROM spreadsheet_cells WHERE name LIKE 'notes!%'`,[],- true+ true,);let parseNote = str => {diff --git a/packages/desktop-client/src/browser-server.js b/packages/desktop-client/src/browser-server.jsindex 7ac16a3e7e..fcb2949c43 100644--- a/packages/desktop-client/src/browser-server.js+++ b/packages/desktop-client/src/browser-server.js@@ -43,7 +43,7 @@ self.addEventListener('message', async e => {if (msg.type === 'init') {hasInitialized = true;let isDev = !!msg.isDev;- let version = msg.version;+ // let version = msg.version;let hash = msg.hash;if (!self.SharedArrayBuffer && !msg.isSharedArrayBufferOverrideEnabled) {@@ -59,7 +59,7 @@ self.addEventListener('message', async e => {{ maxRetries: isDev ? 5 : 0 },);- backend.initApp(version, isDev, self).catch(err => {+ backend.initApp(isDev, self).catch(err => {console.log(err);let msg = {type: 'app-init-failure',diff --git a/packages/desktop-client/src/style.js b/packages/desktop-client/src/style.jsindex e532d85b36..ebf344f6cf 100644--- a/packages/desktop-client/src/style.js+++ b/packages/desktop-client/src/style.js@@ -220,7 +220,6 @@ if (Platform.env === 'web') {function testScrollbars() {let el = document.createElement('div');el.innerHTML =- // eslint-disable-next-line rulesdir/typography'<div style="width:100px;height:100px;overflow:scroll;position:absolute;top:-9999px;"/>';document.body.appendChild(el);let testNode = el.childNodes[0];diff --git a/packages/desktop-electron/.eslintignore b/packages/desktop-electron/.eslintignorenew file mode 100644index 0000000000..54c3eaa2f5--- /dev/null+++ b/packages/desktop-electron/.eslintignore@@ -0,0 +1,2 @@+client-build/+dist/diff --git a/packages/desktop-electron/about.js b/packages/desktop-electron/about.jsindex 93098a5735..54809a5419 100644--- a/packages/desktop-electron/about.js+++ b/packages/desktop-electron/about.js@@ -1,5 +1,5 @@-const isDev = require('electron-is-dev');const { BrowserWindow } = require('electron');+const isDev = require('electron-is-dev');let window;@@ -16,8 +16,8 @@ function openAboutWindow() {resizable: isDev,webPreferences: {nodeIntegration: true,- contextIsolation: false- }+ contextIsolation: false,+ },});window.setBackgroundColor('white');window.setTitle('');diff --git a/packages/desktop-electron/about/index.js b/packages/desktop-electron/about/index.jsindex 728d5e27c5..0286f1c41f 100644--- a/packages/desktop-electron/about/index.js+++ b/packages/desktop-electron/about/index.js@@ -76,8 +76,8 @@ ipcRenderer.on('update-error', (event, msg) => {let text;if (msg.domain === 'SQRLUpdaterErrorDomain' && msg.code === 8) {text = `- Error updating the app. It looks like it's running outside of the applications- folder and can't be written to. Please install the app before updating.+ Error updating the app. It looks like it’s running outside of the applications+ folder and can’t be written to. Please install the app before updating.`;} else {text = 'Error updating the app. Please try again later.';diff --git a/packages/desktop-electron/afterSignHook.js b/packages/desktop-electron/afterSignHook.jsindex 798bbc54df..91815db199 100644--- a/packages/desktop-electron/afterSignHook.js+++ b/packages/desktop-electron/afterSignHook.js@@ -1,5 +1,6 @@const fs = require('fs');const path = require('path');+var electron_notarize = require('electron-notarize');// This is expected to be run by `electron-builder` after it signs the build.@@ -8,7 +9,7 @@ var electron_notarize = require('electron-notarize');// - add the property `"afterSign": "./afterSignHook.js"` to the `build` object in package.json.// - add the property `"certificateSubjectName": "Shift Reset LLC"` (or similar) to the `win` object in package.json.-module.exports = async function(params) {+module.exports = async function (params) {// Only notarize the app on Mac OS only.if (process.platform !== 'darwin' || process.env['SKIP_NOTARIZATION']) {return;@@ -19,7 +20,7 @@ module.exports = async function(params) {let appPath = path.join(params.appOutDir,- `${params.packager.appInfo.productFilename}.app`+ `${params.packager.appInfo.productFilename}.app`,);if (!fs.existsSync(appPath)) {throw new Error(`Cannot find application at: ${appPath}`);@@ -33,7 +34,7 @@ module.exports = async function(params) {appPath: appPath,appleId: '[email protected]',appleIdPassword: '@keychain:AC_PASSWORD',- ascProvider: 'JamesLong106746326'+ ascProvider: 'JamesLong106746326',});} catch (error) {console.error(error);diff --git a/packages/desktop-electron/findOpenSocket.js b/packages/desktop-electron/findOpenSocket.jsindex dc99b89b04..9a34fc5384 100644--- a/packages/desktop-electron/findOpenSocket.js+++ b/packages/desktop-electron/findOpenSocket.js@@ -1,6 +1,3 @@-const net = require('net');-const os = require('os');-const { join } = require('path');const ipc = require('node-ipc');ipc.config.silent = true;diff --git a/packages/desktop-electron/index.js b/packages/desktop-electron/index.jsindex 5e0a200afb..6517155bdd 100644--- a/packages/desktop-electron/index.js+++ b/packages/desktop-electron/index.js@@ -1,3 +1,5 @@+/* eslint-disable import/order */+// (I have no idea why the imports are like this. Not touching them.)const isDev = require('electron-is-dev');require('module').globalPaths.push(__dirname + '/..');@@ -20,15 +22,15 @@ protocol.registerSchemesAsPrivileged([global.fetch = require('node-fetch');+const about = require('./about');const findOpenSocket = require('./findOpenSocket');+const getMenu = require('./menu');const updater = require('./updater');-const about = require('./about');require('./security');const { fork } = require('child_process');const path = require('path');-const getMenu = require('./menu');require('./setRequireHook');@@ -45,7 +47,7 @@ const WindowState = require('./window-state.js');// Keep a global reference of the window object, if you don't, the window will// be closed automatically when the JavaScript object is garbage collected.let clientWin;-let serverWin;+let serverWin; // eslint-disable-line no-unused-varslet serverProcess;let serverSocket;let IS_QUITTING = false;@@ -300,10 +302,6 @@ ipcMain.on('get-bootstrap-data', event => {};});-ipcMain.handle('get-version', () => {- return app.getVersion();-});-ipcMain.handle('relaunch', () => {app.relaunch();app.exit();diff --git a/packages/desktop-electron/menu.js b/packages/desktop-electron/menu.jsindex 05fe9caa2e..e71da500d5 100644--- a/packages/desktop-electron/menu.js+++ b/packages/desktop-electron/menu.js@@ -26,14 +26,14 @@ function getMenu(isDev, createWindow) {if (focusedWindow) {if (focusedWindow.webContents.getTitle() === 'Actual') {focusedWindow.webContents.executeJavaScript(- "__actionsForMenu.replaceModal('load-backup')"+ "__actionsForMenu.replaceModal('load-backup')",);}}- }+ },},{- type: 'separator'+ type: 'separator',},{label: 'Manage files...',@@ -42,7 +42,7 @@ function getMenu(isDev, createWindow) {if (focusedWindow) {if (focusedWindow.webContents.getTitle() === 'Actual') {focusedWindow.webContents.executeJavaScript(- '__actionsForMenu.closeBudget()'+ '__actionsForMenu.closeBudget()',);} else {focusedWindow.close();@@ -51,9 +51,9 @@ function getMenu(isDev, createWindow) {// The default page is the budget listcreateWindow();}- }- }- ]+ },+ },+ ],},{label: 'Edit',@@ -62,42 +62,42 @@ function getMenu(isDev, createWindow) {label: 'Undo',enabled: false,accelerator: 'CmdOrCtrl+Z',- click: function(menuItem, focusedWin) {+ click: function (menuItem, focusedWin) {// UndofocusedWin.webContents.executeJavaScript('__actionsForMenu.undo()');- }+ },},{label: 'Redo',enabled: false,accelerator: 'Shift+CmdOrCtrl+Z',- click: function(menuItem, focusedWin) {+ click: function (menuItem, focusedWin) {// RedofocusedWin.webContents.executeJavaScript('__actionsForMenu.redo()');- }+ },},{- type: 'separator'+ type: 'separator',},{- role: 'cut'+ role: 'cut',},{- role: 'copy'+ role: 'copy',},{- role: 'paste'+ role: 'paste',},{- role: 'pasteandmatchstyle'+ role: 'pasteandmatchstyle',},{- role: 'delete'+ role: 'delete',},{- role: 'selectall'- }- ]+ role: 'selectall',+ },+ ],},{label: 'View',@@ -107,7 +107,7 @@ function getMenu(isDev, createWindow) {accelerator: 'CmdOrCtrl+R',click(item, focusedWindow) {if (focusedWindow) focusedWindow.reload();- }+ },},{label: 'Toggle Developer Tools',@@ -115,27 +115,27 @@ function getMenu(isDev, createWindow) {process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',click(item, focusedWindow) {if (focusedWindow) focusedWindow.webContents.toggleDevTools();- }+ },},isDev && {- type: 'separator'+ type: 'separator',},{- role: 'resetzoom'+ role: 'resetzoom',},{- role: 'zoomin'+ role: 'zoomin',},{- role: 'zoomout'+ role: 'zoomout',},{- type: 'separator'+ type: 'separator',},{- role: 'togglefullscreen'- }- ].filter(x => x)+ role: 'togglefullscreen',+ },+ ].filter(x => x),},{label: 'Tools',@@ -143,30 +143,30 @@ function getMenu(isDev, createWindow) {{label: 'Find schedules',enabled: false,- click: function(menuItem, focusedWin) {+ click: function (menuItem, focusedWin) {focusedWin.webContents.executeJavaScript(- '__history && __history.push("/schedule/discover", { locationPtr: __history.location })'+ '__history && __history.push("/schedule/discover", { locationPtr: __history.location })',);- }+ },},{label: 'Repair split transactions',enabled: false,- click: function(menuItem, focusedWin) {+ click: function (menuItem, focusedWin) {focusedWin.webContents.executeJavaScript(- '__history && __history.push("/tools/fix-splits", { locationPtr: __history.location })'+ '__history && __history.push("/tools/fix-splits", { locationPtr: __history.location })',);- }- }- ]+ },+ },+ ],},{role: 'window',submenu: [{- role: 'minimize'- }- ]+ role: 'minimize',+ },+ ],},{role: 'help',@@ -175,10 +175,10 @@ function getMenu(isDev, createWindow) {label: 'Learn More',click() {shell.openExternal('https://actualbudget.github.io/docs/');- }- }- ]- }+ },+ },+ ],+ },];if (process.platform === 'win32') {@@ -187,7 +187,7 @@ function getMenu(isDev, createWindow) {label: 'About Actual',click() {ipcMain.emit('show-about');- }+ },});} else if (process.platform === 'darwin') {const name = app.getName();@@ -198,58 +198,58 @@ function getMenu(isDev, createWindow) {label: 'About Actual',click() {ipcMain.emit('show-about');- }+ },},isDev && {label: 'Screenshot',click() {ipcMain.emit('screenshot');- }+ },},{- type: 'separator'+ type: 'separator',},{role: 'services',- submenu: []+ submenu: [],},{- type: 'separator'+ type: 'separator',},{- role: 'hide'+ role: 'hide',},{- role: 'hideothers'+ role: 'hideothers',},{- role: 'unhide'+ role: 'unhide',},{- type: 'separator'+ type: 'separator',},{- role: 'quit'- }- ].filter(x => x)+ role: 'quit',+ },+ ].filter(x => x),});// Edit menu.let editIdx = template.findIndex(t => t.label === 'Edit');template[editIdx].submenu.push({- type: 'separator'+ type: 'separator',},{label: 'Speech',submenu: [{- role: 'startspeaking'+ role: 'startspeaking',},{- role: 'stopspeaking'- }- ]- }+ role: 'stopspeaking',+ },+ ],+ },);// Window menu.let windowIdx = template.findIndex(t => t.role === 'window');@@ -257,24 +257,24 @@ function getMenu(isDev, createWindow) {{label: 'Close',accelerator: 'CmdOrCtrl+W',- role: 'close'+ role: 'close',},{label: 'Minimize',accelerator: 'CmdOrCtrl+M',- role: 'minimize'+ role: 'minimize',},{label: 'Zoom',- role: 'zoom'+ role: 'zoom',},{- type: 'separator'+ type: 'separator',},{label: 'Bring All to Front',- role: 'front'- }+ role: 'front',+ },];}diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.jsonindex 4ed66baa27..8e1de45d02 100644--- a/packages/desktop-electron/package.json+++ b/packages/desktop-electron/package.json@@ -8,6 +8,7 @@"clean": "rm -rf dist","update-client": "bin/update-client","build": "electron-builder",+ "lint": "eslint .","watch": "cross-env ACTUAL_DOCUMENT_DIR=\"../../data\" ACTUAL_DATA_DIR=\"../../data\" electron ."},"main": "index.js",diff --git a/packages/desktop-electron/preload.js b/packages/desktop-electron/preload.jsindex 39db38c5d2..6b6430da21 100644--- a/packages/desktop-electron/preload.js+++ b/packages/desktop-electron/preload.js@@ -1,6 +1,7 @@+const fs = require('fs');+const { ipcRenderer, contextBridge } = require('electron');const ipc = require('node-ipc');-const fs = require('fs');let { version: VERSION, isDev: IS_DEV } =ipcRenderer.sendSync('get-bootstrap-data');@@ -32,7 +33,7 @@ contextBridge.exposeInMainWorld('Actual', {},emit(name, data) {return client.emit(name, data);- }+ },});});},@@ -48,7 +49,7 @@ contextBridge.exposeInMainWorld('Actual', {saveFile: async (contents, filename, dialogTitle) => {const fileLocation = await ipcRenderer.invoke('save-file-dialog', {title: dialogTitle,- defaultPath: filename+ defaultPath: filename,});return new Promise((resolve, reject) => {@@ -82,5 +83,5 @@ contextBridge.exposeInMainWorld('Actual', {getServerSocket: () => {return socketPromise;- }+ },});diff --git a/packages/desktop-electron/security.js b/packages/desktop-electron/security.jsindex 6b4f4117d4..08ef6933db 100644--- a/packages/desktop-electron/security.js+++ b/packages/desktop-electron/security.js@@ -1,7 +1,7 @@const electron = require('electron');-electron.app.on('web-contents-created', function(event, contents) {- contents.on('will-attach-webview', function(event, webPreferences, params) {+electron.app.on('web-contents-created', function (event, contents) {+ contents.on('will-attach-webview', function (event, webPreferences, params) {delete webPreferences.preloadURL;delete webPreferences.preload;@@ -24,11 +24,11 @@ electron.app.on('web-contents-created', function(event, contents) {});});-electron.app.on('ready', function() {- electron.session.defaultSession.setPermissionRequestHandler(function(+electron.app.on('ready', function () {+ electron.session.defaultSession.setPermissionRequestHandler(function (webContents,permission,- callback+ callback,) {var url = webContents.getURL();if (url.startsWith('file://')) {diff --git a/packages/desktop-electron/server.js b/packages/desktop-electron/server.jsindex 46fccc68c2..5e21ae9c7d 100644--- a/packages/desktop-electron/server.js+++ b/packages/desktop-electron/server.js@@ -10,23 +10,20 @@ function getBackend() {if (process.argv[2] === '--subprocess') {let isDev = false;- let version = process.argv[3];+ // let version = process.argv[3];let socketName = process.argv[4];// Start the app- getBackend().initApp(version, isDev, socketName);+ getBackend().initApp(isDev, socketName);} else if (process.argv[2] === '--standalone') {require('source-map-support').install();- getBackend().initApp('0.0.0-standalone', true, 'actual-standalone');+ getBackend().initApp(true, 'actual-standalone');} else {let { ipcRenderer } = require('electron');let isDev = true;- let versionPromise = ipcRenderer.invoke('get-version');ipcRenderer.on('set-socket', (event, { name }) => {- versionPromise.then(version => {- // Start the app- getBackend().initApp(version, isDev, name);- });+ // Start the app+ getBackend().initApp(isDev, name);});}diff --git a/packages/desktop-electron/setRequireHook.js b/packages/desktop-electron/setRequireHook.jsindex d587e3398b..ad66c6b9e5 100644--- a/packages/desktop-electron/setRequireHook.js+++ b/packages/desktop-electron/setRequireHook.js@@ -1,3 +1,3 @@-require.extensions['.electron.js'] = function(module, filename) {+require.extensions['.electron.js'] = function (module, filename) {return require.extensions['.js'](module, filename);};diff --git a/packages/desktop-electron/signWindowsHook.js b/packages/desktop-electron/signWindowsHook.jsindex 05029c927f..dff7ebff1a 100644--- a/packages/desktop-electron/signWindowsHook.js+++ b/packages/desktop-electron/signWindowsHook.js@@ -2,20 +2,22 @@ const { execSync } = require('child_process');const {SIGN_TOOL_PATH = 'C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x64\\signtool.exe',- TIMESTAMP_SERVER = 'http://timestamp.digicert.com'+ TIMESTAMP_SERVER = 'http://timestamp.digicert.com',} = process.env;const SITE = 'https://actualbudget.com/';const importPfx = (certPath, password) => {+ /* eslint-disable rulesdir/typography */const command = [['certutil'],['-f'],['-p', `"${password}"`],- ['-importPfx', 'My', `"${certPath}"`, 'NoRoot']+ ['-importPfx', 'My', `"${certPath}"`, 'NoRoot'],].map(sub => sub.join(' ')).join(' ');+ /* eslint-enable rulesdir/typography */try {execSync(command, { stdio: 'inherit' });@@ -25,6 +27,7 @@ const importPfx = (certPath, password) => {};const signBinary = (path, name) => {+ /* eslint-disable rulesdir/typography */const command = [[`"${SIGN_TOOL_PATH}"`],['sign'],@@ -34,10 +37,11 @@ const signBinary = (path, name) => {['/t', `"${TIMESTAMP_SERVER}"`],['/d', `"${name}"`],['/du', `"${SITE}"`],- [`"${path}"`]+ [`"${path}"`],].map(sub => sub.join(' ')).join(' ');+ /* eslint-enable rulesdir/typography */try {execSync(command, { stdio: 'inherit' });diff --git a/packages/desktop-electron/updater.js b/packages/desktop-electron/updater.jsindex 432d1ce3ae..ef339f679f 100644--- a/packages/desktop-electron/updater.js+++ b/packages/desktop-electron/updater.js@@ -1,5 +1,4 @@const isDev = require('electron-is-dev');-const { app } = require('electron');const { autoUpdater } = require('electron-updater');// Every 5 minutes@@ -22,7 +21,7 @@ autoUpdater.on('update-downloaded', info => {fireEvent('update-downloaded', {releaseNotes: info.releaseNotes,releaseName: info.releaseName,- version: info.version+ version: info.version,});});@@ -100,5 +99,5 @@ module.exports = {apply,check,isChecking,- getLastEvent+ getLastEvent,};diff --git a/packages/desktop-electron/window-state.js b/packages/desktop-electron/window-state.jsindex 52dd71342e..119a38357c 100644--- a/packages/desktop-electron/window-state.js+++ b/packages/desktop-electron/window-state.js@@ -1,6 +1,8 @@let fs = require('fs');let path = require('path');+let electron = require('electron');+let backend = require('loot-core/lib-dist/bundle.desktop.js');function loadState() {@@ -9,8 +11,8 @@ function loadState() {state = JSON.parse(fs.readFileSync(path.join(backend.lib.getDataDir(), 'window.json'),- 'utf8'- )+ 'utf8',+ ),);} catch (e) {console.log('Could not load window state');@@ -37,7 +39,7 @@ function saveState(win, state) {fs.writeFileSync(path.join(backend.lib.getDataDir(), 'window.json'),JSON.stringify(state),- 'utf8'+ 'utf8',);}@@ -123,9 +125,9 @@ async function get() {x: 100,y: 50,width: Math.min(1000, displayBounds.width - 100),- height: Math.min(700, displayBounds.width - 50)+ height: Math.min(700, displayBounds.width - 50),},- state+ state,);return state;diff --git a/packages/eslint-plugin-actual/lib/rules/__tests__/typography.js b/packages/eslint-plugin-actual/lib/rules/__tests__/typography.jsindex 013a3f3add..1228c5981e 100644--- a/packages/eslint-plugin-actual/lib/rules/__tests__/typography.js+++ b/packages/eslint-plugin-actual/lib/rules/__tests__/typography.js@@ -26,6 +26,8 @@ ruleTester.run('typography', rule, {`let test = \`I said ‘Hello, world!’\`;`,`let selected = document.querySelector('[data-test="foo"]');`,`let selected = document.querySelectorAll('[data-test="foo"]');`,+ `myNode.innerHTML = '<div data-test="foo">Hello, world!</div>';`,+ `foo.bar.webContents.executeJavaScript('console.log("Hello, world!")');`,],invalid: [diff --git a/packages/eslint-plugin-actual/lib/rules/typography.js b/packages/eslint-plugin-actual/lib/rules/typography.jsindex cbfe12a719..cd32cfc183 100644--- a/packages/eslint-plugin-actual/lib/rules/typography.js+++ b/packages/eslint-plugin-actual/lib/rules/typography.js@@ -86,14 +86,26 @@ module.exports = {);}+ function isSetInnerHTML(node) {+ return (+ node.type === 'AssignmentExpression' &&+ node.operator === '=' &&+ node.left.type === 'MemberExpression' &&+ node.left.property.type === 'Identifier' &&+ node.left.property.name === 'innerHTML'+ );+ }+function isIgnored(node) {return (isExpectingSQLToMatch(node) ||isNewRegExp(node) ||+ isSetInnerHTML(node) ||isIdentifierCall(node, 'runQuery') ||isIdentifierCall(node, 'compile') ||isMemberCall(node, null, ['querySelector', 'querySelectorAll']) ||isMemberCall(node, null, ['runQuery', 'first', 'all']) ||+ isMemberCall(node, null, ['executeJavaScript']) ||isMemberCall(node, 'db', ['first', 'all']) ||isMemberCall(node, 'spreadsheet', ['set']));diff --git a/packages/eslint-plugin-actual/package.json b/packages/eslint-plugin-actual/package.jsonindex ed9161c915..7f61ab9ac3 100644--- a/packages/eslint-plugin-actual/package.json+++ b/packages/eslint-plugin-actual/package.json@@ -12,7 +12,6 @@"requireindex": "^1.2.0"},"devDependencies": {- "eslint": "^8.19.0","eslint-plugin-eslint-plugin": "^5.0.0","eslint-plugin-node": "^11.1.0","jest": "^27.0.0",diff --git a/packages/import-ynab4/importer.js b/packages/import-ynab4/importer.jsindex 46269d4e9f..bdb59bfe25 100644--- a/packages/import-ynab4/importer.js+++ b/packages/import-ynab4/importer.js@@ -73,10 +73,6 @@ function monthFromDate(date) {return d.format(_parse(date), 'yyyy-MM');}-function getCurrentMonth() {- return d.format(new Date(), 'yyyy-MM');-}-// Importerasync function importAccounts(data, entityIdMap) {@@ -89,11 +85,11 @@ async function importAccounts(data, entityIdMap) {type: mapAccountType(account.accountType),name: account.accountName,offbudget: account.onBudget ? false : true,- closed: account.hidden ? true : false+ closed: account.hidden ? true : false,});entityIdMap.set(account.entityId, id);}- })+ }),);}@@ -110,14 +106,14 @@ async function importCategories(data, entityIdMap) {) {const id = await actual.createCategoryGroup({name: masterCategory.name,- is_income: false+ is_income: false,});entityIdMap.set(masterCategory.entityId, id);if (masterCategory.subCategories) {const subCategories = sortByKey(masterCategory.subCategories,- 'sortableIndex'+ 'sortableIndex',);subCategories.reverse();@@ -127,14 +123,14 @@ async function importCategories(data, entityIdMap) {if (!category.isTombstone) {const id = await actual.createCategory({name: category.name,- group_id: entityIdMap.get(category.masterCategoryId)+ group_id: entityIdMap.get(category.masterCategoryId),});entityIdMap.set(category.entityId, id);}}}}- })+ }),);}@@ -144,7 +140,7 @@ async function importPayees(data, entityIdMap) {let id = await actual.createPayee({name: payee.name,category: entityIdMap.get(payee.autoFillCategoryId) || null,- transfer_acct: entityIdMap.get(payee.targetAccountId) || null+ transfer_acct: entityIdMap.get(payee.targetAccountId) || null,});// TODO: import payee rules@@ -192,7 +188,6 @@ async function importTransactions(data, entityIdMap) {}}- let sortOrder = 1;let transactionsGrouped = groupBy(data.transactions, 'accountId');await Promise.all(@@ -202,7 +197,7 @@ async function importTransactions(data, entityIdMap) {let toImport = transactions.map(transaction => {if (transaction.isTombstone) {- return;+ return null;}let id = entityIdMap.get(transaction.entityId);@@ -214,16 +209,20 @@ async function importTransactions(data, entityIdMap) {let imported_payee = null;if (transferId) {payee = payees.find(- p => p.transfer_acct === entityIdMap.get(t.targetAccountId)+ p => p.transfer_acct === entityIdMap.get(t.targetAccountId),).id;} else {payee = entityIdMap.get(t.payeeId);imported_payee = data.payees.find(- p => p.entityId === t.payeeId+ p => p.entityId === t.payeeId,)?.name;}-- return { transfer_id: transferId, payee, imported_payee: imported_payee};++ return {+ transfer_id: transferId,+ payee,+ imported_payee: imported_payee,+ };}let newTransaction = {@@ -235,7 +234,7 @@ async function importTransactions(data, entityIdMap) {date: transaction.date,notes: transaction.memo || null,cleared: transaction.cleared === 'Cleared',- ...transferProperties(transaction)+ ...transferProperties(transaction),};newTransaction.subtransactions =@@ -245,7 +244,7 @@ async function importTransactions(data, entityIdMap) {amount: amountToInteger(t.amount),category: getCategory(t.categoryId),notes: t.memo || null,- ...transferProperties(t)+ ...transferProperties(t),};});@@ -254,7 +253,7 @@ async function importTransactions(data, entityIdMap) {.filter(x => x);await actual.addTransactions(entityIdMap.get(accountId), toImport);- })+ }),);}@@ -272,7 +271,7 @@ function fillInBudgets(data, categoryBudgets) {if (!budgets.find(b => b.categoryId === category.entityId)) {budgets.push({budgeted: 0,- categoryId: category.entityId+ categoryId: category.entityId,});}});@@ -288,7 +287,7 @@ async function importBudgets(data, entityIdMap) {for (let budget of budgets) {let filled = fillInBudgets(data,- budget.monthlySubCategoryBudgets.filter(b => !b.isTombstone)+ budget.monthlySubCategoryBudgets.filter(b => !b.isTombstone),);await Promise.all(@@ -307,7 +306,7 @@ async function importBudgets(data, entityIdMap) {} else if (catBudget.overspendingHandling === 'Confined') {await actual.setBudgetCarryover(month, catId, true);}- })+ }),);}});@@ -340,7 +339,7 @@ function findLatestDevice(zipped, entries) {return {deviceGUID: data.deviceGUID,shortName: data.shortDeviceId,- recentness: estimateRecentness(data.knowledge)+ recentness: estimateRecentness(data.knowledge),};}@@ -430,7 +429,7 @@ async function importBuffer(filepath, buffer) {let budgetPath = join(root, meta.relativeDataFolderName);let deviceFiles = entries.filter(e =>- e.entryName.startsWith(join(budgetPath, 'devices'))+ e.entryName.startsWith(join(budgetPath, 'devices')),);let deviceGUID = findLatestDevice(zipped, deviceFiles);diff --git a/packages/import-ynab4/index.js b/packages/import-ynab4/index.jsindex 29b1d8917c..214f3affb7 100755--- a/packages/import-ynab4/index.js+++ b/packages/import-ynab4/index.js@@ -1,7 +1,9 @@#!/usr/bin/env nodeconst fs = require('fs');+const { init, shutdown } = require('@actual-app/api');-const { findBudgets, importBuffer } = require('./importer');++const { importBuffer } = require('./importer');async function run() {let filepath = process.argv[2];diff --git a/packages/import-ynab4/package.json b/packages/import-ynab4/package.jsonindex d5cd2bd2c1..a154569825 100644--- a/packages/import-ynab4/package.json+++ b/packages/import-ynab4/package.json@@ -15,6 +15,9 @@},"bin": "./index.js","homepage": "https://github.com/actualbudget/actual/tree/master/packages/import-ynab4#readme",+ "scripts": {+ "lint": "eslint ."+ },"dependencies": {"@actual-app/api": "*","adm-zip": "^0.5.9",diff --git a/packages/import-ynab5/importer.js b/packages/import-ynab5/importer.jsindex 7b95709077..6562d19d66 100644--- a/packages/import-ynab5/importer.js+++ b/packages/import-ynab5/importer.js@@ -3,7 +3,6 @@// case and ignore everything else; otherwise we'd be pulling in the// entire backend bundle from the APIconst actual = require('@actual-app/api/methods');-const d = require('date-fns');const uuid = require('uuid');function amountFromYnab(amount) {@@ -48,7 +47,7 @@ function sortByKey(arr, key) {}function groupBy(arr, keyName) {- return arr.reduce(function(obj, item) {+ return arr.reduce(function (obj, item) {var key = item[keyName];if (!obj.hasOwnProperty(key)) {obj[key] = [];@@ -66,11 +65,11 @@ function importAccounts(data, entityIdMap) {type: mapAccountType(account.type),name: account.name,offbudget: account.on_budget ? false : true,- closed: account.closed+ closed: account.closed,});entityIdMap.set(account.id, id);}- })+ }),);}@@ -86,7 +85,7 @@ async function importCategories(data, entityIdMap) {if (cat.category_group_id ===data.category_groups.find(- group => group.name === 'Internal Master Category'+ group => group.name === 'Internal Master Category',).id) {if (ynabIncomeCategories.includes(cat.name)) {@@ -114,13 +113,13 @@ async function importCategories(data, entityIdMap) {) {var groupId = await actual.createCategoryGroup({name: group.name,- is_income: false+ is_income: false,});entityIdMap.set(group.id, groupId);}let cats = data.categories.filter(- cat => cat.category_group_id === group.id+ cat => cat.category_group_id === group.id,);for (let cat of cats.reverse()) {@@ -158,11 +157,11 @@ function importPayees(data, entityIdMap) {data.payees.map(async payee => {if (!payee.deleted) {let id = await actual.createPayee({- name: payee.name+ name: payee.name,});entityIdMap.set(payee.id, id);}- })+ }),);}@@ -171,10 +170,10 @@ async function importTransactions(data, entityIdMap) {const categories = await actual.getCategories();const incomeCatId = categories.find(cat => cat.name === 'Income').id;const startingBalanceCatId = categories.find(- cat => cat.name === 'Starting Balances'+ cat => cat.name === 'Starting Balances',).id; //better way to do it?const startingPayeeYNAB = data.payees.find(- payee => payee.name === 'Starting Balance'+ payee => payee.name === 'Starting Balance',).id;let transactionsGrouped = groupBy(data.transactions, 'account_id');@@ -203,7 +202,7 @@ async function importTransactions(data, entityIdMap) {return {amount: amountFromYnab(subtrans.amount),category: entityIdMap.get(subtrans.category_id) || null,- notes: subtrans.memo+ notes: subtrans.memo,};});}@@ -220,7 +219,7 @@ async function importTransactions(data, entityIdMap) {imported_id: transaction.import_id || null,transfer_id:entityIdMap.get(transaction.transfer_transaction_id) || null,- subtransactions: subtransactions+ subtransactions: subtransactions,};// Handle transfer payee@@ -228,13 +227,13 @@ async function importTransactions(data, entityIdMap) {newTransaction.payee = payees.find(p =>p.transfer_acct ===- entityIdMap.get(transaction.transfer_account_id)+ entityIdMap.get(transaction.transfer_account_id),).id;} else {newTransaction.payee = entityIdMap.get(transaction.payee_id);newTransaction.imported_payee = data.payees.find(- p => !p.deleted && p.id === t.payeeId- )?.name;+ p => !p.deleted && p.id === transaction.payee_id,+ )?.name;}// Handle starting balances@@ -250,7 +249,7 @@ async function importTransactions(data, entityIdMap) {.filter(x => x);await actual.addTransactions(entityIdMap.get(accountId), toImport);- })+ }),);}@@ -266,10 +265,10 @@ async function importBudgets(data, entityIdMap) {let budgets = sortByKey(data.months, 'month');const internalCatIdYnab = data.category_groups.find(- group => group.name === 'Internal Master Category'+ group => group.name === 'Internal Master Category',).id;const creditcardCatIdYnab = data.category_groups.find(- group => group.name === 'Credit Card Payments'+ group => group.name === 'Credit Card Payments',).id;await actual.batchBudgetUpdates(async () => {@@ -290,7 +289,7 @@ async function importBudgets(data, entityIdMap) {}await actual.setBudgetAmount(month, catId, amount);- })+ }),);}});diff --git a/packages/import-ynab5/index.js b/packages/import-ynab5/index.jsindex afaf141e59..1b2e9f7204 100755--- a/packages/import-ynab5/index.js+++ b/packages/import-ynab5/index.js@@ -1,7 +1,9 @@#!/usr/bin/env nodeconst fs = require('fs');+const { init, shutdown } = require('@actual-app/api');-const { findBudgets, importYNAB5 } = require('./importer');++const { importYNAB5 } = require('./importer');async function run() {let filepath = process.argv[2];diff --git a/packages/import-ynab5/package.json b/packages/import-ynab5/package.jsonindex 842feae60a..44b3029955 100644--- a/packages/import-ynab5/package.json+++ b/packages/import-ynab5/package.json@@ -15,6 +15,9 @@},"bin": "./index.js","homepage": "https://github.com/actualbudget/actual/tree/master/packages/import-ynab5#readme",+ "scripts": {+ "lint": "eslint ."+ },"dependencies": {"@actual-app/api": "*","date-fns": "^2.29.3",diff --git a/packages/loot-core/bin/profile-sql.js b/packages/loot-core/bin/profile-sql.jsindex eff238545b..3f3c938ccd 100755--- a/packages/loot-core/bin/profile-sql.js+++ b/packages/loot-core/bin/profile-sql.js@@ -1,13 +1,14 @@#!/usr/bin/env actual-cli-runner.jsimport fs from 'fs';import os from 'os';++import asyncStorage from '../src/platform/server/asyncStorage';import * as sqlite from '../src/platform/server/sqlite';+import { runQuery } from '../src/server/aql';import * as db from '../src/server/db';import { batchMessages, setSyncingMode } from '../src/server/sync';-import { runQuery } from '../src/server/aql';-import asyncStorage from '../src/platform/server/asyncStorage';-import { makeChild } from '../src/shared/transactions';import q from '../src/shared/query';+import { makeChild } from '../src/shared/transactions';let dbPath = process.argv[3];@@ -38,29 +39,29 @@ async function init() {date: '2020-01-' + pad(Math.floor(Math.random() * 30)),amount: Math.floor(Math.random() * 10000),account: accounts[0].id,- notes: 'foo'+ notes: 'foo',};db.insertTransaction(parent);db.insertTransaction(makeChild(parent, {- amount: Math.floor(Math.random() * 1000)- })+ amount: Math.floor(Math.random() * 1000),+ }),);db.insertTransaction(makeChild(parent, {- amount: Math.floor(Math.random() * 1000)- })+ amount: Math.floor(Math.random() * 1000),+ }),);db.insertTransaction(makeChild(parent, {- amount: Math.floor(Math.random() * 1000)- })+ amount: Math.floor(Math.random() * 1000),+ }),);} else {db.insertTransaction({date: '2020-01-' + pad(Math.floor(Math.random() * 30)),amount: Math.floor(Math.random() * 10000),- account: accounts[0].id+ account: accounts[0].id,});}}@@ -89,10 +90,7 @@ async function init() {console.log('starting');let s = Date.now();let { data } = await runQuery(- q('transactions')- .select('*')- .options({ splits: 'grouped' })- .serialize()+ q('transactions').select('*').options({ splits: 'grouped' }).serialize(),);console.log('# items:', data.length);console.log('time:', Date.now() - s);diff --git a/packages/loot-core/init-node.js b/packages/loot-core/init-node.jsindex a6f998710e..d45c597450 100644--- a/packages/loot-core/init-node.js+++ b/packages/loot-core/init-node.js@@ -1,4 +1,5 @@let { dirname, basename } = require('path');+require('source-map-support').install();global.fetch = require('node-fetch');let bundle = require('./lib-dist/bundle.desktop.js');@@ -19,7 +20,7 @@ async function run() {await send('transaction-add', {date: '2022-03-20',account: accounts[0].id,- amount: 1000+ amount: 1000,});await new Promise(resolve => {diff --git a/packages/loot-core/migrations/1632571489012_remove_cache.js b/packages/loot-core/migrations/1632571489012_remove_cache.jsindex 1993e3d6b6..2f3764c47d 100644--- a/packages/loot-core/migrations/1632571489012_remove_cache.js+++ b/packages/loot-core/migrations/1632571489012_remove_cache.js@@ -6,7 +6,7 @@ export default async function runMigration(db, uuid) {db.execQuery(`CREATE TABLE zero_budget_months(id TEXT PRIMARY KEY,- buffered INTEGER DEFAULT 0);+ buffered INTEGER DEFAULT 0);CREATE TABLE zero_budgets(id TEXT PRIMARY KEY,@@ -34,12 +34,12 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let budget = db.runQuery(`SELECT * FROM spreadsheet_cells WHERE name LIKE 'budget%!budget-%'`,[],- true+ true,);db.transaction(() => {- budget.map(monthBudget => {+ budget.forEach(monthBudget => {let match = monthBudget.name.match(- /^(budget-report|budget)(\d+)!budget-(.+)$/+ /^(budget-report|budget)(\d+)!budget-(.+)$/,);if (match == null) {console.log('Warning: invalid budget month name', monthBudget.name);@@ -60,7 +60,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let carryover = db.runQuery('SELECT * FROM spreadsheet_cells WHERE name = ?',[`${sheetName}!carryover-${cat}`],- true+ true,);let table = type === 'budget-report' ? 'reflect_budgets' : 'zero_budgets';@@ -71,8 +71,8 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);dbmonth,cat,amount,- carryover.length > 0 && getValue(carryover[0]) === 'true' ? 1 : 0- ]+ carryover.length > 0 && getValue(carryover[0]) === 'true' ? 1 : 0,+ ],);});});@@ -81,10 +81,10 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let buffers = db.runQuery(`SELECT * FROM spreadsheet_cells WHERE name LIKE 'budget%!buffered'`,[],- true+ true,);db.transaction(() => {- buffers.map(buffer => {+ buffers.forEach(buffer => {let match = buffer.name.match(/^budget(\d+)!buffered$/);if (match) {let month = match[1].slice(0, 4) + '-' + match[1].slice(4);@@ -95,7 +95,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);db.runQuery(`INSERT INTO zero_budget_months (id, buffered) VALUES (?, ?)`,- [month, amount]+ [month, amount],);}});@@ -105,7 +105,7 @@ CREATE TABLE kvcache_key (id INTEGER PRIMARY KEY, key REAL);let notes = db.runQuery(`SELECT * FROM spreadsheet_cells WHERE name LIKE 'notes!%'`,[],- true+ true,);let parseNote = str => {diff --git a/packages/loot-core/package.json b/packages/loot-core/package.jsonindex 4856827ccc..611d9118f0 100644--- a/packages/loot-core/package.json+++ b/packages/loot-core/package.json@@ -9,7 +9,7 @@"build:api": "cross-env NODE_ENV=development webpack --config ./webpack/webpack.api.config.js","build:browser": "cross-env NODE_ENV=production ./bin/build-browser","watch:browser": "cross-env NODE_ENV=development ./bin/build-browser",- "lint": "eslint src",+ "lint": "eslint .","test": "npm-run-all -cp 'test:*'","test:node": "jest -c jest.config.js","test:web": "jest -c jest.web.config.js"@@ -49,7 +49,6 @@"buffer": "^5.5.0","cross-env": "^7.0.3","date-fns": "^2.29.3",- "eslint": "8.35.0","fake-indexeddb": "^3.1.3","fast-check": "3.7.1","jest": "^27.0.0",diff --git a/packages/loot-core/src/server/main.js b/packages/loot-core/src/server/main.jsindex 333ea6026b..86bbe82aaa 100644--- a/packages/loot-core/src/server/main.js+++ b/packages/loot-core/src/server/main.js@@ -85,7 +85,6 @@ const SyncPb = require('./sync/proto/sync_pb');// let indexeddb = require('../platform/server/indexeddb');-let VERSION;let DEMO_BUDGET_ID = '_demo-budget';let TEST_BUDGET_ID = '_test-budget';let UNCONFIGURED_SERVER = 'https://not-configured/';@@ -1803,10 +1802,6 @@ handlers['sync'] = async function () {return fullSync();};-handlers['get-version'] = async function () {- return { version: VERSION };-};-handlers['get-budgets'] = async function () {const paths = await fs.listDir(fs.getDocumentDir());const budgets = (@@ -1938,7 +1933,7 @@ handlers['load-budget'] = async function ({ id }) {}}- let res = await loadBudget(id, VERSION, { showUpdate: true });+ let res = await loadBudget(id, { showUpdate: true });return res;};@@ -2036,7 +2031,7 @@ handlers['create-budget'] = async function ({);// Load it in- let { error } = await loadBudget(id, VERSION);+ let { error } = await loadBudget(id);if (error) {console.log('Error creating budget: ' + error);return { error };@@ -2157,7 +2152,7 @@ handlers['export-budget'] = async function () {return await cloudStorage.exportBuffer();};-async function loadBudget(id, appVersion, { showUpdate } = {}) {+async function loadBudget(id, { showUpdate } = {}) {let dir;try {dir = fs.getBudgetDir(id);@@ -2396,9 +2391,7 @@ async function setupDocumentsDir() {fs._setDocumentDir(documentDir);}-export async function initApp(version, isDev, socketName) {- VERSION = version;-+export async function initApp(isDev, socketName) {await sqlite.init();await Promise.all([asyncStorage.init(), fs.init()]);await setupDocumentsDir();@@ -2423,7 +2416,7 @@ export async function initApp(version, isDev, socketName) {// if (isDev) {// const lastBudget = await asyncStorage.getItem('lastBudget');// if (lastBudget) {- // loadBudget(lastBudget, VERSION);+ // loadBudget(lastBudget);// }// }@@ -2453,8 +2446,6 @@ export async function initApp(version, isDev, socketName) {export async function init(config) {// Get from build- // eslint-disable-next-line no-undef- VERSION = ACTUAL_APP_VERSION;let dataDir, serverURL;if (config) {diff --git a/packages/loot-core/webpack/webpack.api.config.js b/packages/loot-core/webpack/webpack.api.config.jsindex db50386eff..3523d199c5 100644--- a/packages/loot-core/webpack/webpack.api.config.js+++ b/packages/loot-core/webpack/webpack.api.config.js@@ -1,7 +1,5 @@let path = require('path');-let webpack = require('webpack');-let config = require('./webpack.desktop.config');config.resolve.extensions = [@@ -24,10 +22,4 @@ config.output.path = path.join('app',);-config.plugins.push(- new webpack.DefinePlugin({- ACTUAL_APP_VERSION: '"0.0.147"',- }),-);-module.exports = config;diff --git a/packages/node-libofx/.eslintignore b/packages/node-libofx/.eslintignorenew file mode 100644index 0000000000..ebaff39709--- /dev/null+++ b/packages/node-libofx/.eslintignore@@ -0,0 +1,3 @@+libofx.*.js+libofx/+OpenSP-*/diff --git a/packages/node-libofx/index.js b/packages/node-libofx/index.jsindex fd0ac8681b..54b52a8acd 100644--- a/packages/node-libofx/index.js+++ b/packages/node-libofx/index.js@@ -1,5 +1,5 @@-const libofxWrapper = require('./libofx');const createFFI = require('./ffi');+const libofxWrapper = require('./libofx');let _libofxPromise;let _libofx;@@ -9,21 +9,21 @@ var parser = {ctx: null,transactions: [],- reset: function() {+ reset: function () {// TODO: free all C objectsparser.transactions = [];},- onTransaction: function(trans) {+ onTransaction: function (trans) {parser.transactions.push({amount: ffi.transaction_amount(trans),fi_id: ffi.transaction_fi_id(trans),date: ffi.transaction_date(trans),payee: ffi.transaction_payee(trans),name: ffi.transaction_name(trans),- memo: ffi.transaction_memo(trans)+ memo: ffi.transaction_memo(trans),});- }+ },};async function initModule() {@@ -37,7 +37,7 @@ async function initModule() {}return __dirname + '/' + path;}- }+ },}).then(libofx => {ffi = createFFI(libofx);@@ -47,7 +47,7 @@ async function initModule() {ffi.ofx_set_transaction_cb(parser.ctx,- libofx.addFunction(parser.onTransaction, 'vi')+ libofx.addFunction(parser.onTransaction, 'vi'),);_libofx = libofx;diff --git a/packages/node-libofx/package.json b/packages/node-libofx/package.jsonindex 0ed68bac44..d17e8b5334 100644--- a/packages/node-libofx/package.json+++ b/packages/node-libofx/package.json@@ -4,5 +4,8 @@"description": "","main": "index.js","author": "",- "license": "ISC"+ "license": "ISC",+ "scripts": {+ "lint": "eslint ."+ }}diff --git a/upcoming-release-notes/861.md b/upcoming-release-notes/861.mdnew file mode 100644index 0000000000..6bee165776--- /dev/null+++ b/upcoming-release-notes/861.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [j-f1]+---++Enable linting for all packagesdiff --git a/yarn.lock b/yarn.lockindex 17442f7060..e83512095a 100644--- a/yarn.lock+++ b/yarn.lock@@ -72,7 +72,6 @@ __metadata:date-fns: ^2.29.3debounce: ^1.2.0downshift: 1.31.16- eslint: ^8.35.0focus-visible: ^4.1.1formik: ^0.11.10glamor: ^2.20.40@@ -1995,68 +1994,44 @@ __metadata:linkType: hard"@eslint-community/eslint-utils@npm:^4.2.0":- version: 4.3.0- resolution: "@eslint-community/eslint-utils@npm:4.3.0"+ version: 4.4.0+ resolution: "@eslint-community/eslint-utils@npm:4.4.0"dependencies:eslint-visitor-keys: ^3.3.0peerDependencies:eslint: ^6.0.0 || ^7.0.0 || >=8.0.0- checksum: f487760a692f0f1fef76e248ad72976919576ba57edc2b1b1dc1d182553bae6b5bf7b078e654da85d04f0af8a485d20bd26280002768f4fbcd2e330078340cb0+ checksum: cdfe3ae42b4f572cbfb46d20edafe6f36fc5fb52bf2d90875c58aefe226892b9677fef60820e2832caf864a326fe4fc225714c46e8389ccca04d5f9288aabd22languageName: nodelinkType: hard"@eslint-community/regexpp@npm:^4.4.0":- version: 4.4.0- resolution: "@eslint-community/regexpp@npm:4.4.0"- checksum: 2d127af0c752b80e8a782eacfe996a86925d21de92da3ffc6f9e615e701145e44a62e26bdd88bfac2cd76779c39ba8d9875a91046ec5e7e5f23cb647c247ea6a- languageName: node- linkType: hard--"@eslint/eslintrc@npm:^2.0.0":- version: 2.0.0- resolution: "@eslint/eslintrc@npm:2.0.0"- dependencies:- ajv: ^6.12.4- debug: ^4.3.2- espree: ^9.4.0- globals: ^13.19.0- ignore: ^5.2.0- import-fresh: ^3.2.1- js-yaml: ^4.1.0- minimatch: ^3.1.2- strip-json-comments: ^3.1.1- checksum: 31119c8ca06723d80384f18f5c78e0530d8e6306ad36379868650131a8b10dd7cffd7aff79a5deb3a2e9933660823052623d268532bae9538ded53d5b19a69a6+ version: 4.5.0+ resolution: "@eslint-community/regexpp@npm:4.5.0"+ checksum: 99c01335947dbd7f2129e954413067e217ccaa4e219fe0917b7d2bd96135789384b8fedbfb8eb09584d5130b27a7b876a7150ab7376f51b3a0c377d5ce026a10languageName: nodelinkType: hard-"@eslint/eslintrc@npm:^2.0.1":- version: 2.0.1- resolution: "@eslint/eslintrc@npm:2.0.1"+"@eslint/eslintrc@npm:^2.0.2":+ version: 2.0.2+ resolution: "@eslint/eslintrc@npm:2.0.2"dependencies:ajv: ^6.12.4debug: ^4.3.2- espree: ^9.5.0+ espree: ^9.5.1globals: ^13.19.0ignore: ^5.2.0import-fresh: ^3.2.1js-yaml: ^4.1.0minimatch: ^3.1.2strip-json-comments: ^3.1.1- checksum: 56b9192a687a450db53a7b883daf9f0f447c43b3510189cf88808a7a2467c2a302a42a50f184cc6d5a9faf3d1df890a2ef0fd0d60b751f32a3e9dfea717c6b48- languageName: node- linkType: hard--"@eslint/js@npm:8.35.0":- version: 8.35.0- resolution: "@eslint/js@npm:8.35.0"- checksum: 6687ceff659a6d617e37823f809dc9c4b096535961a81acead27d26b1a51a4cf608a5e59d831ddd57f24f6f8bb99340a4a0e19f9c99b390fbb4b275f51ed5f5e+ checksum: cfcf5e12c7b2c4476482e7f12434e76eae16fcd163ee627309adb10b761e5caa4a4e52ed7be464423320ff3d11eca5b50de5bf8be3e25834222470835dd5c801languageName: nodelinkType: hard-"@eslint/js@npm:8.36.0":- version: 8.36.0- resolution: "@eslint/js@npm:8.36.0"- checksum: b7d6b84b823c8c7784be390741196617565527b1f7c0977fde9455bfb57fd88f81c074a03dd878757d2c33fa29f24291e9ecbc1425710f067917324b55e1bf3a+"@eslint/js@npm:8.37.0":+ version: 8.37.0+ resolution: "@eslint/js@npm:8.37.0"+ checksum: 7a07fb085c94ce1538949012c292fd3a6cd734f149bc03af6157dfbd8a7477678899ef57b4a27e15b36470a997389ad79a0533d5880c71e67720ae1a7de7c62dlanguageName: nodelinkType: hard@@ -4962,7 +4937,7 @@ __metadata:resolution: "actual@workspace:."dependencies:cross-env: ^5.1.5- eslint: 8.35.0+ eslint: ^8.37.0eslint-config-react-app: 7.0.1eslint-plugin-prettier: 4.2.1eslint-plugin-rulesdir: ^0.2.2@@ -9045,7 +9020,6 @@ __metadata:version: 0.0.0-use.localresolution: "eslint-plugin-actual@workspace:packages/eslint-plugin-actual"dependencies:- eslint: ^8.19.0eslint-plugin-eslint-plugin: ^5.0.0eslint-plugin-node: ^11.1.0jest: ^27.0.0@@ -9316,6 +9290,13 @@ __metadata:languageName: nodelinkType: hard+"eslint-visitor-keys@npm:^3.4.0":+ version: 3.4.0+ resolution: "eslint-visitor-keys@npm:3.4.0"+ checksum: 33159169462d3989321a1ec1e9aaaf6a24cc403d5d347e9886d1b5bfe18ffa1be73bdc6203143a28a606b142b1af49787f33cff0d6d0813eb5f2e8d2e1a6043c+ languageName: node+ linkType: hard+"eslint-webpack-plugin@npm:^3.1.1":version: 3.2.0resolution: "eslint-webpack-plugin@npm:3.2.0"@@ -9332,64 +9313,14 @@ __metadata:languageName: nodelinkType: hard-"eslint@npm:8.35.0, eslint@npm:^8.3.0, eslint@npm:^8.35.0":- version: 8.35.0- resolution: "eslint@npm:8.35.0"- dependencies:- "@eslint/eslintrc": ^2.0.0- "@eslint/js": 8.35.0- "@humanwhocodes/config-array": ^0.11.8- "@humanwhocodes/module-importer": ^1.0.1- "@nodelib/fs.walk": ^1.2.8- ajv: ^6.10.0- chalk: ^4.0.0- cross-spawn: ^7.0.2- debug: ^4.3.2- doctrine: ^3.0.0- escape-string-regexp: ^4.0.0- eslint-scope: ^7.1.1- eslint-utils: ^3.0.0- eslint-visitor-keys: ^3.3.0- espree: ^9.4.0- esquery: ^1.4.2- esutils: ^2.0.2- fast-deep-equal: ^3.1.3- file-entry-cache: ^6.0.1- find-up: ^5.0.0- glob-parent: ^6.0.2- globals: ^13.19.0- grapheme-splitter: ^1.0.4- ignore: ^5.2.0- import-fresh: ^3.0.0- imurmurhash: ^0.1.4- is-glob: ^4.0.0- is-path-inside: ^3.0.3- js-sdsl: ^4.1.4- js-yaml: ^4.1.0- json-stable-stringify-without-jsonify: ^1.0.1- levn: ^0.4.1- lodash.merge: ^4.6.2- minimatch: ^3.1.2- natural-compare: ^1.4.0- optionator: ^0.9.1- regexpp: ^3.2.0- strip-ansi: ^6.0.1- strip-json-comments: ^3.1.0- text-table: ^0.2.0- bin:- eslint: bin/eslint.js- checksum: 6212173691d90b1bc94dd3d640e1f210374b30c3905fc0a15e501cf71c6ca52aa3d80ea7a9a245adaaed26d6019169e01fb6881b3f2885b188d37069c749308c- languageName: node- linkType: hard--"eslint@npm:^8.19.0":- version: 8.36.0- resolution: "eslint@npm:8.36.0"+"eslint@npm:^8.3.0, eslint@npm:^8.37.0":+ version: 8.37.0+ resolution: "eslint@npm:8.37.0"dependencies:"@eslint-community/eslint-utils": ^4.2.0"@eslint-community/regexpp": ^4.4.0- "@eslint/eslintrc": ^2.0.1- "@eslint/js": 8.36.0+ "@eslint/eslintrc": ^2.0.2+ "@eslint/js": 8.37.0"@humanwhocodes/config-array": ^0.11.8"@humanwhocodes/module-importer": ^1.0.1"@nodelib/fs.walk": ^1.2.8@@ -9400,8 +9331,8 @@ __metadata:doctrine: ^3.0.0escape-string-regexp: ^4.0.0eslint-scope: ^7.1.1- eslint-visitor-keys: ^3.3.0- espree: ^9.5.0+ eslint-visitor-keys: ^3.4.0+ espree: ^9.5.1esquery: ^1.4.2esutils: ^2.0.2fast-deep-equal: ^3.1.3@@ -9428,29 +9359,18 @@ __metadata:text-table: ^0.2.0bin:eslint: bin/eslint.js- checksum: e9a961fc3b3de5cff5a1cb2c92eeffaa7e155a715489e30b3e1e76f186bd1255e0481e09564f2094733c0b1dbd3453499fb72ae7c043c83156e11e6d965b2304+ checksum: 80f3d5cdce2d671f4794e392d234a78d039c347673defb0596268bd481e8f30a53d93c01ff4f66a546c87d97ab4122c0e9cafe1371f87cb03cee6b7d5aa97595languageName: nodelinkType: hard-"espree@npm:^9.4.0":- version: 9.4.1- resolution: "espree@npm:9.4.1"+"espree@npm:^9.5.1":+ version: 9.5.1+ resolution: "espree@npm:9.5.1"dependencies:acorn: ^8.8.0acorn-jsx: ^5.3.2- eslint-visitor-keys: ^3.3.0- checksum: 4d266b0cf81c7dfe69e542c7df0f246e78d29f5b04dda36e514eb4c7af117ee6cfbd3280e560571ed82ff6c9c3f0003c05b82583fc7a94006db7497c4fe4270e- languageName: node- linkType: hard--"espree@npm:^9.5.0":- version: 9.5.0- resolution: "espree@npm:9.5.0"- dependencies:- acorn: ^8.8.0- acorn-jsx: ^5.3.2- eslint-visitor-keys: ^3.3.0- checksum: a7f110aefb6407e0d3237aa635ab3cea87106ae63748dd23c67031afccc640d04c4209fca2daf16e2233c82efb505faead0fb84097478fd9cc6e8f8dd80bf99d+ eslint-visitor-keys: ^3.4.0+ checksum: cdf6e43540433d917c4f2ee087c6e987b2063baa85a1d9cdaf51533d78275ebd5910c42154e7baf8e3e89804b386da0a2f7fad2264d8f04420e7506bf87b3b88languageName: nodelinkType: hard@@ -13684,7 +13604,6 @@ __metadata:csv-stringify: ^5.3.6date-fns: ^2.29.3deep-equal: ^2.0.5- eslint: 8.35.0fake-indexeddb: ^3.1.3fast-check: 3.7.1google-protobuf: ^3.12.0-rc.1