rafaelcaricio/actual
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'actualbudget:master' into master

Browse source
This commit is contained in:
Rich Howell 2022-08-24 18:12:38 +01:00 committed by GitHub
parent 6d31a1cda9 31e2b01df3
commit a94def9c55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
138 changed files with 25586 additions and 19252 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
.circleci/config.yml
View file

@ -1,121 +0,0 @@
default_config: &default_config
environment:
SENTRY_ORG: shift-reset-llc
SENTRY_PROJECT: actual
YARN_CACHE_FOLDER: ~/.cache/yarn
CSC_LINK: ~/windows-shift-reset-llc.p12
cached_files: &cached_files
paths:
- ~/.cache/yarn
- node_modules
- ./packages/desktop-electron/node_modules
- ./packages/loot-core/node_modules
- ./mobile/node_modules
- ./import-ynab4/node_modules
- ./api/node_modules
- ./node-libofx/node_modules
- ./loot-design/node_modules
- ./desktop-client/node_modules
key: v3-dependencies-{{ checksum "yarn.lock" }}
version_tag_only: &version_tag_only
filters:
branches:
ignore: /.*/
tags:
only: /^\d+\.\d+\.\d+$/
version: 2.1
orbs:
win: circleci/windows@2.2.0
jobs:
test:
<<: *default_config
docker:
- image: circleci/node:16.15.0
working_directory: ~/repo
steps:
- checkout
- restore_cache:
keys:
- v3-dependencies-{{ checksum "yarn.lock" }}
- run: yarn install --pure-lockfile
- save_cache:
<<: *cached_files
- run: yarn test
build_windows:
<<: *default_config
executor:
name: win/default
working_directory: ~/repo
steps:
- checkout
- run:
command: npm install -g @sentry/cli --unsafe-perm
shell: bash
- run:
command: echo $WINDOWS_CERT | base64 --decode >> ${HOME}/windows-shift-reset-llc.p12
shell: bash
- run:
command: yarn install --pure-lockfile
shell: bash
- run:
command: ./bin/package --release --version ${CIRCLE_TAG}
shell: bash
build_linux:
<<: *default_config
docker:
- image: circleci/node:16.15.0
working_directory: ~/repo
steps:
- checkout
- restore_cache:
keys:
- v3-dependencies-{{ checksum "yarn.lock" }}
- run: yarn install --pure-lockfile
- run: sudo npm install -g @sentry/cli --unsafe-perm
- run: ./bin/package --release --version ${CIRCLE_TAG}
workflows:
version: 2
test:
jobs:
- test
build_version:
jobs:
- test:
<<: *version_tag_only
- build_windows:
<<: *version_tag_only
requires:
- test
- build_linux:
<<: *version_tag_only
requires:
- test

10
.eslintrc.js Normal file
View file

@ -0,0 +1,10 @@
module.exports = {
plugins: ["prettier"],
extends: ["react-app"],
rules: {
"prettier/prettier": "error",
"no-unused-vars": "off",
"no-loop-func": "off",
"no-restricted-globals": "off"
}
};

14
.github/workflows/opened-issues-triage.yml vendored Normal file
View file

@ -0,0 +1,14 @@
name: Mark new issue for triage
on:
issues:
types: [opened]
jobs:
needs-triage:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions-ecosystem/action-add-labels@v1
with:
labels: needs triage

18
.github/workflows/test.yml vendored Normal file
View file

@ -0,0 +1,18 @@
name: Test
on:
push:
branches:
- master
pull_request:
branches: '*'
jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Set up environment
uses: ./.github/actions/setup
- name: Test
run: yarn test

9
.gitignore vendored
View file

@ -20,3 +20,12 @@ bundle.mobile.js.map
export-2020-01-10.csv
**/*.log
# Yarn
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions

4
.prettierrc.json Normal file
View file

@ -0,0 +1,4 @@
{
"singleQuote": true,
"trailingComma": "none"
}

28
.yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs vendored Normal file
View file

File diff suppressed because one or more lines are too long

785
.yarn/releases/yarn-3.2.0.cjs vendored Executable file
View file

File diff suppressed because one or more lines are too long

7
.yarnrc.yml Normal file
View file

@ -0,0 +1,7 @@
nodeLinker: node-modules
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
yarnPath: .yarn/releases/yarn-3.2.0.cjs

21
bin/package
View file

@ -80,27 +80,14 @@ if [[ $CI != true && "$OSTYPE" == "darwin"* ]]; then
yarn lint
fi
./node_modules/.bin/patch-package
yarn patch-package
(
cd packages/loot-design;
../../node_modules/.bin/patch-package
)
yarn workspace mobile patch-package
(
cd packages/mobile;
../../node_modules/.bin/patch-package
)
yarn workspace loot-core build:node
(
cd packages/loot-core;
NODE_ENV=production yarn build:node
)
yarn workspace @actual-app/web build
(
cd packages/desktop-client;
yarn build
)
rm -fr packages/desktop-electron/client-build
cp -r packages/desktop-client/build packages/desktop-electron/client-build

15
bin/package-browser
View file

@ -56,19 +56,8 @@ if [ $CI != true ]; then
yarn lint
fi
(
cd packages/loot-design;
../../node_modules/.bin/patch-package
)
ACTUAL_RELEASE_TYPE=$RELEASE yarn workspace loot-core build:browser
(
cd packages/loot-core;
ACTUAL_RELEASE_TYPE=$RELEASE yarn build:browser
)
(
cd packages/desktop-client;
REACT_APP_RELEASE_TYPE=$RELEASE yarn build:browser
)
REACT_APP_RELEASE_TYPE=$RELEASE yarn workspace @actual-app/web build:browser
echo "packages/desktop-client/build"

58
package.json
View file

@ -15,46 +15,22 @@
"workspaces": {
"packages": [
"packages/*"
],
"nohoist": [
"**/better-sqlite3",
"**/better-sqlite3/**",
"mobile/react-native",
"mobile/react-native-*",
"mobile/rn-fetch-blob",
"mobile/**/event-target-shim",
"mobile/@sentry/react-native",
"mobile/nodejs-mobile-react-native",
"**/mobile/nodejs-mobile-react-native/**",
"**/@react-native-community/**",
"**/@react-navigation/**",
"mobile/react-navigation",
"mobile/react-navigation-tabs",
"mobile/rn-snoopy",
"mobile/rn-snoopy/**",
"mobile/detox",
"mobile/detox/**",
"mobile/jsc-android",
"mobile/jsc-android/**",
"**/react-native-web",
"**/react-native-web/**",
"**/@sentry/cli"
]
},
"scripts": {
"start": "npm-run-all --parallel start:desktop-*",
"start:desktop-node": "cd packages/loot-core && yarn watch:node",
"start:desktop-client": "cd packages/desktop-client && yarn watch",
"start:desktop-electron": "cd packages/desktop-electron && yarn watch",
"start:browser": "npm-run-all --parallel start:browser-*",
"start:browser-backend": "cd packages/loot-core && yarn watch:browser",
"start:browser-frontend": "cd packages/desktop-client && yarn start:browser",
"start": "npm-run-all --parallel 'start:desktop-*'",
"start:desktop-node": "yarn workspace loot-core watch:node",
"start:desktop-client": "yarn workspace @actual-app/web watch",
"start:desktop-electron": "yarn workspace Actual watch",
"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",
"test": "./node_modules/.bin/jest --maxWorkers=4",
"test:debug": "node ./node_modules/.bin/jest --runInBand --useStderr",
"test:debug-brk": "node --inspect-brk ./node_modules/.bin/jest --runInBand",
"rebuild-electron": "./node_modules/.bin/electron-rebuild -f -m ./packages/loot-core",
"rebuild-node": "cd packages/loot-core && npm rebuild",
"lint": "cd packages/loot-core && yarn lint",
"rebuild-node": "yarn workspace loot-core rebuild",
"lint": "yarn workspace loot-core lint",
"postinstall": "rm -rf ./packages/loot-design/node_modules/react && rm -rf ./packages/mobile/node_modules/react && rm -rf ./node_modules/react-native && patch-package"
},
"devDependencies": {
@ -62,28 +38,18 @@
"cross-env": "^5.1.5",
"husky": "^3.0.4",
"npm-run-all": "^4.1.3",
"patch-package": "^6.1.2",
"prettier": "^1.18.1",
"pretty-quick": "^1.11.1",
"shelljs": "^0.8.2",
"source-map-support": "^0.5.21"
},
"eslintConfig": {
"extends": "react-app",
"rules": {
"no-unused-vars": "off",
"no-loop-func": "off",
"no-restricted-globals": "off"
}
},
"prettier": {
"singleQuote": true,
"trailingComma": "none"
},
"resolutions": {
"@babel/preset-env": "^7.15.1",
"@babel/core": "^7.15.1",
"@babel/runtime": "^7.15.1",
"@babel/helper-plugin-utils": "^7.14.5",
"react-error-overlay": "6.0.9"
}
},
"packageManager": "yarn@3.2.0"
}

4
packages/desktop-client/config/webpack.config.js
View file

@ -518,6 +518,10 @@ module.exports = function(webpackEnv) {
// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
// You can remove this if you don't use Moment.js:
new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
// Pikaday throws a warning if Moment.js is not installed however it doesn't
// actually require it to be installed. As we don't use Moment.js ourselves
// then we can just silence this warning.
new webpack.IgnorePlugin(/moment$/, /pikaday$/),
!(isEnvDevelopment || process.env.PERF_BUILD) &&
new webpack.IgnorePlugin(/perf-deets\/frontend/),
// Generate a service worker script that will precache, and keep up to date,

6
packages/desktop-client/package.json
View file

@ -14,7 +14,6 @@
"@reactions/component": "^2.0.2",
"@sentry/browser": "6.12.0",
"@svgr/webpack": "2.4.1",
"add": "^2.0.6",
"babel-eslint": "9.0.0",
"babel-loader": "8.0.4",
"babel-preset-jwl-app": "6.1.12",
@ -23,6 +22,7 @@
"case-sensitive-paths-webpack-plugin": "2.1.2",
"chalk": "2.4.1",
"codemirror": "^5.37.0",
"cross-env": "^7.0.3",
"css-loader": "1.0.0",
"date-fns": "2.0.0-alpha.27",
"debounce": "^1.2.0",
@ -41,10 +41,8 @@
"fs-extra": "7.0.0",
"glamor": "^2.20.40",
"html-webpack-plugin": "4.0.0-alpha.2",
"http-client": "^4.3.1",
"identity-obj-proxy": "3.0.0",
"load-js": "^3.0.3",
"lodash.memoize": "^4.1.2",
"mini-css-extract-plugin": "0.4.3",
"mitt": "^1.1.2",
"optimize-css-assets-webpack-plugin": "5.0.1",
@ -55,7 +53,6 @@
"postcss-preset-env": "6.3.1",
"postcss-safe-parser": "4.0.1",
"prop-types": "15.6.0",
"raven-js": "^3.21.0",
"react": "16.13.1",
"react-addons-shallow-compare": "^15.6.0",
"react-app-polyfill": "^0.1.3",
@ -75,7 +72,6 @@
"sass-loader": "7.1.0",
"style-loader": "0.23.0",
"terser-webpack-plugin": "1.1.0",
"url-loader": "1.1.1",
"victory": "^0.26.1",
"webpack": "4.19.1",
"webpack-dev-server": "3.11.0",

8
packages/desktop-client/src/components/Box.js
View file

@ -9,14 +9,18 @@ function getFlex(flex) {
}
function Box({ flex, children, direction, style }) {
return <div
return (
<div
style={{
...style,
flex: getFlex(flex),
display: 'flex',
flexDirection: direction || 'column'
}}
>{children}</div>;
>
{children}
</div>
);
}
export default Box;

2
packages/desktop-client/src/components/Debugger.js
View file

@ -206,7 +206,7 @@ class Debugger extends React.Component {
height: 10,
backgroundColor: '#303030',
marginRight: 10,
borderRadius: 10,
borderRadius: 10
}}
/>
<Button onClick={this.toggleRecord} style={{ marginRight: 10 }}>

4
packages/desktop-client/src/components/FatalError.js
View file

@ -99,7 +99,9 @@ class FatalError extends React.Component {
.
</P>
<P>
<Button onClick={() => window.Actual.relaunch()}>{buttonText}</Button>
<Button onClick={() => window.Actual.relaunch()}>
{buttonText}
</Button>
</P>
<P isLast={true} style={{ fontSize: 11 }}>
<Link

5
packages/desktop-client/src/components/FinancesApp.js
View file

@ -277,7 +277,4 @@ function FinancesAppWithContext(props) {
);
}
export default connect(
null,
actions
)(FinancesAppWithContext);
export default connect(null, actions)(FinancesAppWithContext);

8
packages/desktop-client/src/components/accounts/Account.js
View file

@ -642,7 +642,7 @@ const AccountHeader = React.memo(
let searchInput = useRef(null);
let splitsExpanded = useSplitsExpanded();
let canSync = syncEnabled && (account && account.account_id);
let canSync = syncEnabled && account && account.account_id;
if (!account) {
// All accounts - check for any syncable account
canSync = !!accounts.find(account => !!account.account_id);
@ -1701,9 +1701,9 @@ class AccountInternal extends React.PureComponent {
}
showAccount={
!accountId ||
(accountId === 'offbudget' ||
accountId === 'budgeted' ||
accountId === 'uncategorized')
accountId === 'offbudget' ||
accountId === 'budgeted' ||
accountId === 'uncategorized'
}
isAdding={this.state.isAdding}
isNew={this.isNew}

6
packages/desktop-client/src/components/accounts/Filters.js
View file

@ -149,7 +149,11 @@ function ConfigureField({ field, op, value, dispatch, onApply }) {
['amount-outflow', 'Amount (outflow)']
]
: field === 'date'
? [['date', 'Date'], ['month', 'Month'], ['year', 'Year']]
? [
['date', 'Date'],
['month', 'Month'],
['year', 'Year']
]
: null
}
value={subfield}

23
packages/desktop-client/src/components/manager/ManagementApp.js
View file

@ -230,17 +230,14 @@ class ManagementApp extends React.Component {
}
}
export default connect(
state => {
let { modalStack } = state.modals;
export default connect(state => {
let { modalStack } = state.modals;
return {
files: state.budgets.allFiles,
userData: state.user.data,
managerHasInitialized: state.app.managerHasInitialized,
loadingText: state.app.loadingText,
currentModals: modalStack.map(modal => modal.name)
};
},
actions
)(ManagementApp);
return {
files: state.budgets.allFiles,
userData: state.user.data,
managerHasInitialized: state.app.managerHasInitialized,
loadingText: state.app.loadingText,
currentModals: modalStack.map(modal => modal.name)
};
}, actions)(ManagementApp);

7
packages/desktop-client/src/components/manager/subscribe/ConfirmPasswordForm.js
View file

@ -47,6 +47,7 @@ export function ConfirmPasswordForm({ buttons, onSetPassword, onError }) {
type={showPassword ? 'text' : 'password'}
value={password1}
onChange={e => setPassword1(e.target.value)}
onEnter={onSubmit}
/>
<Input
placeholder="Confirm password"
@ -54,6 +55,7 @@ export function ConfirmPasswordForm({ buttons, onSetPassword, onError }) {
value={password2}
onChange={e => setPassword2(e.target.value)}
style={{ marginTop: 10 }}
onEnter={onSubmit}
/>
<View
@ -69,10 +71,7 @@ export function ConfirmPasswordForm({ buttons, onSetPassword, onError }) {
</label>
<View style={{ flex: 1 }} />
{buttons}
<ButtonWithLoading
primary
loading={loading}
>
<ButtonWithLoading primary loading={loading}>
OK
</ButtonWithLoading>
</View>

5
packages/desktop-client/src/components/modals/WelcomeScreen.js
View file

@ -70,7 +70,4 @@ function WelcomeScreen({ modalProps, actions }) {
);
}
export default connect(
null,
actions
)(WelcomeScreen);
export default connect(null, actions)(WelcomeScreen);

2
packages/desktop-client/src/components/reports/Change.js
View file

@ -2,7 +2,7 @@ import React from 'react';
import { styles } from 'loot-design/src/style';
import { integerToCurrency } from 'loot-core/src/shared/util';
import { Block } from 'loot-design/src/components/common';
import { colors } from 'loot-design/src/style'
import { colors } from 'loot-design/src/style';
function Change({ amount, style }) {
return (

11
packages/desktop-client/src/components/reports/Overview.js
View file

@ -110,7 +110,10 @@ function CashFlowCard() {
const end = monthUtils.currentDay();
const start = monthUtils.currentMonth() + '-01';
const data = useReport('cash_flow_simple', useArgsMemo(simpleCashFlow)(start, end));
const data = useReport(
'cash_flow_simple',
useArgsMemo(simpleCashFlow)(start, end)
);
if (!data) {
return null;
}
@ -218,9 +221,9 @@ function CashFlowCard() {
function Overview({ accounts }) {
return (
<View
style={[
styles.page,
{ paddingLeft: 40, paddingRight: 40, minWidth: 700 }
style={[
styles.page,
{ paddingLeft: 40, paddingRight: 40, minWidth: 700 }
]}
>
<View

6
packages/desktop-client/src/components/tutorial/BudgetInitial.js
View file

@ -15,9 +15,9 @@ function BudgetInitial({ accounts, navigationProps }) {
{!minimized && (
<React.Fragment>
<P>
You should see all of your current accounts' balance available
to budget. Click on the budgeted column for a category create a
budget. Keep doing this until your "To Budget" amount is zero.
You should see all of your current accounts' balance available to
budget. Click on the budgeted column for a category create a budget.
Keep doing this until your "To Budget" amount is zero.
</P>
<P>
Don't worry too much about your initial budget. Just guess. You'll

7
packages/desktop-client/src/components/tutorial/BudgetNextMonth.js
View file

@ -61,7 +61,6 @@ function BudgetNextMonth({ stepTwo, navigationProps }) {
);
}
export default connect(
null,
dispatch => bindActionCreators(actions, dispatch)
)(BudgetNextMonth);
export default connect(null, dispatch => bindActionCreators(actions, dispatch))(
BudgetNextMonth
);

2
packages/desktop-client/src/components/tutorial/CategoryBalance.js
View file

@ -5,7 +5,7 @@ import { styles, colors } from 'loot-design/src/style';
import { Standalone, Title, useMinimized } from './common';
function CategoryBalance({ targetRect, navigationProps }) {
let [minimized, toggle] = useMinimized()
let [minimized, toggle] = useMinimized();
return (
<Standalone>

7
packages/desktop-client/src/components/tutorial/Overspending.js
View file

@ -96,7 +96,6 @@ function Overspending({ navigationProps, stepTwo }) {
);
}
export default connect(
null,
dispatch => bindActionCreators(actions, dispatch)
)(Overspending);
export default connect(null, dispatch => bindActionCreators(actions, dispatch))(
Overspending
);

4
packages/desktop-client/src/components/tutorial/TransactionAdd.js
View file

@ -33,8 +33,8 @@ function TransactionAdd({ targetRect, navigationProps }) {
</P>
<P isLast={true}>
Try <strong>clicking "Add New"</strong> to see how adding
transactions affects your budget.
Try <strong>clicking "Add New"</strong> to see how adding transactions
affects your budget.
</P>
<Navigation {...navigationProps} showBack={false} />

2
packages/desktop-client/src/components/tutorial/TransactionFinalize.js
View file

@ -3,7 +3,7 @@ import { P } from 'loot-design/src/components/common';
import { css } from 'glamor';
import Navigation from './Navigation';
import * as monthUtils from 'loot-core/src/shared/months';
import {Standalone} from './common';
import { Standalone } from './common';
function TransactionFinalize({ navigationProps }) {
return (

4
packages/import-ynab4/importer.js
View file

@ -2,8 +2,8 @@ const d = require('date-fns');
const normalizePathSep = require('slash');
const uuid = require('uuid');
const AdmZip = require('adm-zip');
const actual = require('@actual-app/api/methods');
const { amountToInteger } = require('@actual-app/api/utils');
const actual = require('@actual-app/api');
const amountToInteger = actual.utils.amountToInteger;
// Utils

3
packages/import-ynab5/importer.js
View file

@ -1,7 +1,6 @@
const d = require('date-fns');
const uuid = require('uuid');
const actual = require('@actual-app/api/methods');
const { amountToInteger } = require('@actual-app/api/utils');
const actual = require('@actual-app/api');
function amountFromYnab(amount) {
// ynabs multiplies amount by 1000 and actual by 100

1
packages/loot-core/bin/get-db-schema Executable file → Normal file
View file

@ -3,7 +3,6 @@ process.env.LOOT_DATA_DIR = __dirname + '/../../../../data';
import * as sqlite from '../platform/server/sqlite';
import * as db from '../server/db';
import { getMessages } from '../server/sync';
import Timestamp from '../server/timestamp';
let dbPath = process.argv[2];
let tables = [

1
packages/loot-core/bin/profile-sql.js
View file

@ -4,7 +4,6 @@ import os from 'os';
import * as sqlite from '../src/platform/server/sqlite';
import * as db from '../src/server/db';
import { batchMessages, setSyncingMode } from '../src/server/sync';
import Timestamp from '../src/server/timestamp';
import { runQuery } from '../src/server/aql/schema/run-query';
import asyncStorage from '../src/platform/server/asyncStorage';
import { makeChild } from '../src/shared/transactions';

10
packages/loot-core/package.json
View file

@ -43,25 +43,29 @@
"babel-jest": "25.2.6",
"babel-loader": "^8.0.6",
"buffer": "^5.5.0",
"cross-env": "^7.0.3",
"damerau-levenshtein": "^1.0.4",
"date-fns": "2.0.0-alpha.27",
"eslint": "5.6.0",
"eslint-plugin-prettier": "^3.1.4",
"esm": "^3.0.82",
"fake-indexeddb": "^3.1.3",
"fast-check": "^2.11.0",
"fast-check": "2.13.0",
"fast-glob": "^2.2.0",
"jest": "25.2.7",
"jsverify": "^0.8.4",
"lru-cache": "^5.1.1",
"memfs": "3.1.1",
"memoize-one": "^4.0.0",
"mockdate": "^3.0.5",
"mock-require": "^3.0.2",
"mockdate": "^3.0.5",
"murmurhash": "^0.0.2",
"perf-deets": "^1.0.15",
"prettier": "^1.19.1",
"sanitize-filename": "^1.6.1",
"search-query-parser": "^1.3.0",
"source-map": "^0.7.3",
"snapshot-diff": "^0.2.2",
"source-map": "^0.7.3",
"throttleit": "^1.0.0",
"uuid": "3.3.2",
"webpack": "^4.41.2",

2
packages/loot-core/src/client/actions/account.js
View file

@ -1,6 +1,6 @@
import { send } from '../../platform/client/fetch';
import constants from '../constants';
import { getPayees, getAccounts, filterTransactions } from './queries';
import { getPayees, getAccounts } from './queries';
import { addNotification } from './notifications';
export function setAccountsSyncing(name) {

2
packages/loot-core/src/client/actions/debug.js
View file

@ -5,5 +5,5 @@ export function debugCell(sheet, name) {
type: constants.DEBUG_CELL,
sheet,
name
}
};
}

3
packages/loot-core/src/client/actions/sync.js
View file

@ -1,10 +1,7 @@
import { send } from '../../platform/client/fetch';
import constants from '../constants';
import { loadPrefs } from './prefs';
import { createBudget, loadBudget } from './budgets';
import { getCategories, getAccounts, getPayees } from './queries';
import { syncAccounts } from './account';
import { setAppState } from './app';
import { pushModal } from './modals';
import { getUploadError } from '../../shared/errors';

1
packages/loot-core/src/client/actions/tutorial.js
View file

@ -1,4 +1,3 @@
import constants from '../constants';
import { send } from '../../platform/client/fetch';
import Platform from '../platform';
import { pushModal } from './modals';

4
packages/loot-core/src/client/data-hooks/accounts.js
View file

@ -1,5 +1,5 @@
import React, { useMemo, useEffect, useState, useContext } from 'react';
import q, { liveQuery, runQuery } from 'loot-core/src/client/query-helpers';
import React, { useEffect, useState, useContext } from 'react';
import q, { liveQuery } from 'loot-core/src/client/query-helpers';
import { getAccountsById } from 'loot-core/src/client/reducers/queries';
export function useAccounts() {

4
packages/loot-core/src/client/data-hooks/payees.js
View file

@ -1,5 +1,5 @@
import React, { useMemo, useEffect, useState, useContext } from 'react';
import q, { liveQuery, runQuery } from 'loot-core/src/client/query-helpers';
import React, { useEffect, useState, useContext } from 'react';
import q, { liveQuery } from 'loot-core/src/client/query-helpers';
import { getPayeesById } from 'loot-core/src/client/reducers/queries';
export function usePayees() {

6
packages/loot-core/src/client/data-hooks/schedules.js
View file

@ -1,11 +1,9 @@
import React, { useMemo, useEffect, useState, useContext } from 'react';
import * as monthUtils from 'loot-core/src/shared/months';
import React, { useEffect, useState, useContext } from 'react';
import {
getStatus,
getHasTransactionsQuery
} from 'loot-core/src/shared/schedules';
import q, { liveQuery, runQuery } from 'loot-core/src/client/query-helpers';
import { send } from 'loot-core/src/platform/client/fetch';
import q, { liveQuery } from 'loot-core/src/client/query-helpers';
function loadStatuses(schedules, onData) {
return liveQuery(getHasTransactionsQuery(schedules), onData, {

2
packages/loot-core/src/client/query-helpers.js
View file

@ -1,5 +1,5 @@
import { listen, send } from '../platform/client/fetch';
import { once, runAgain } from '../shared/async';
import { once } from '../shared/async';
import q, { getPrimaryOrderBy } from '../shared/query';
export default q;

18
packages/loot-core/src/mocks/budget.js
View file

@ -439,15 +439,19 @@ async function fillOther(handlers, account, payees, groups) {
async function createBudget(accounts, payees, groups) {
let primaryAccount = accounts.find(a => (a.name = 'Bank of America'));
let earliestDate = (await db.first(
`SELECT * FROM v_transactions t LEFT JOIN accounts a ON t.account = a.id
let earliestDate = (
await db.first(
`SELECT * FROM v_transactions t LEFT JOIN accounts a ON t.account = a.id
WHERE a.offbudget = 0 AND t.is_child = 0 ORDER BY date ASC LIMIT 1`
)).date;
let earliestPrimaryDate = (await db.first(
`SELECT * FROM v_transactions t LEFT JOIN accounts a ON t.account = a.id
)
).date;
let earliestPrimaryDate = (
await db.first(
`SELECT * FROM v_transactions t LEFT JOIN accounts a ON t.account = a.id
WHERE a.id = ? AND a.offbudget = 0 AND t.is_child = 0 ORDER BY date ASC LIMIT 1`,
[primaryAccount.id]
)).date;
[primaryAccount.id]
)
).date;
let start = monthUtils.monthFromDate(db.fromDateRepr(earliestDate));
let end = monthUtils.currentMonth();

1
packages/loot-core/src/mocks/plaid.js
View file

@ -1,4 +1,3 @@
import dateFns from 'date-fns';
const uuid = require('../platform/uuid');
export function generateAccount(balance) {

1
packages/loot-core/src/mocks/setup.js
View file

@ -5,7 +5,6 @@ import * as sheet from '../server/sheet';
import * as rules from '../server/accounts/transaction-rules';
import * as tracking from '../server/tracking/events';
import { setSyncingMode } from '../server/sync';
import * as monthUtils from '../shared/months';
import { updateVersion } from '../server/update';
import { resetTracer, tracer } from '../shared/test-helpers';
import {

5
packages/loot-core/src/platform/client/fetch/index.browser.js
View file

@ -172,7 +172,10 @@ module.exports.listen = function listen(name, cb) {
return () => {
let arr = listeners.get(name);
listeners.set(name, arr.filter(cb_ => cb_ !== cb));
listeners.set(
name,
arr.filter(cb_ => cb_ !== cb)
);
};
};

5
packages/loot-core/src/platform/client/fetch/index.mobile.js
View file

@ -82,7 +82,10 @@ function listen(name, cb) {
return () => {
let arr = listeners.get(name);
listeners.set(name, arr.filter(cb_ => cb_ !== cb));
listeners.set(
name,
arr.filter(cb_ => cb_ !== cb)
);
};
}

5
packages/loot-core/src/platform/client/fetch/index.testing.js
View file

@ -56,6 +56,9 @@ module.exports.listen = function listen(name, cb) {
return () => {
let arr = listeners.get(name);
listeners.set(name, arr.filter(cb_ => cb_ !== cb));
listeners.set(
name,
arr.filter(cb_ => cb_ !== cb)
);
};
};

5
packages/loot-core/src/platform/client/fetch/index.web.js
View file

@ -117,7 +117,10 @@ module.exports.listen = function listen(name, cb) {
return () => {
let arr = listeners.get(name);
if (arr) {
listeners.set(name, arr.filter(cb_ => cb_ !== cb));
listeners.set(
name,
arr.filter(cb_ => cb_ !== cb)
);
}
};
};

6
packages/loot-core/src/platform/exceptions/index.testing.js
View file

@ -1,5 +1,3 @@
export function captureException(exc) {
}
export function captureException(exc) {}
export function captureBreadcrumb(info) {
}
export function captureBreadcrumb(info) {}

6
packages/loot-core/src/platform/server/fs/index.web.js
View file

@ -167,9 +167,9 @@ async function _removeFile(filepath) {
// Load files from the server that should exist by default
async function populateDefaultFilesystem() {
let index = await (await fetch(
process.env.PUBLIC_URL + 'data-file-index.txt'
)).text();
let index = await (
await fetch(process.env.PUBLIC_URL + 'data-file-index.txt')
).text();
let files = index
.split('\n')
.map(name => name.trim())

11
packages/loot-core/src/platform/server/fs/index.web.test.js
View file

@ -4,16 +4,7 @@ require('fake-indexeddb/auto');
let FDBFactory = require('fake-indexeddb/lib/FDBFactory');
let idb = require('../indexeddb');
let {
init,
populateFileHeirarchy,
readFile,
writeFile,
exists,
pathToId,
listDir,
join
} = require('./index');
let { init, readFile, writeFile, exists, pathToId, join } = require('./index');
beforeAll(() => {
process.env.PUBLIC_URL =

1
packages/loot-core/src/server/accounts/export-to-csv.js
View file

@ -1,4 +1,3 @@
import fs from 'fs';
import csvStringify from 'csv-stringify/lib/sync';
import { runQuery as aqlQuery } from '../aql/schema/run-query';
import { integerToAmount } from '../../shared/util';

2
packages/loot-core/src/server/accounts/link.js
View file

@ -1,6 +1,6 @@
import asyncStorage from '../../platform/server/asyncStorage';
import * as db from '../db';
import { getServer } from '../server-config';
import { getServer } from '../server-config';
import * as bankSync from './sync';
import { fromPlaidAccountType } from '../../shared/accounts';
import { amountToInteger } from '../../shared/util';

1
packages/loot-core/src/server/accounts/rules.js
View file

@ -7,7 +7,6 @@ import {
isAfter,
addDays,
subDays,
format as formatDate,
parseDate
} from '../../shared/months';
import { fastSetMerge } from '../../shared/util';

1
packages/loot-core/src/server/accounts/rules.test.js
View file

@ -1,6 +1,5 @@
import {
parseDateString,
parseRecurDate,
rankRules,
iterateIds,
Condition,

11
packages/loot-core/src/server/accounts/sync.js
View file

@ -1,24 +1,15 @@
import title from './title';
import * as db from '../db';
import {
mergeObjects,
hasFieldsChanged,
toRelaxedNumber,
amountToInteger,
integerToAmount
} from '../../shared/util';
import { hasFieldsChanged, amountToInteger } from '../../shared/util';
import {
makeChild as makeChildTransaction,
recalculateSplit
} from '../../shared/transactions';
import * as monthUtils from '../../shared/months';
import { transactionModel } from '../api-models';
import { getServer } from '../server-config';
import { batchMessages } from '../sync';
import { runMutator } from '../mutators';
import { getStartingBalancePayee } from './payees';
import * as transfer from './transfer';
import { TransactionError } from '../errors';
import { runRules } from './transaction-rules';
import { batchUpdateTransactions } from './transactions';

16
packages/loot-core/src/server/accounts/title/lower-case.js
View file

@ -1,18 +1,18 @@
const conjunctions = [
'for',
'for', //
'and',
'nor',
'but',
'or',
'yet',
'so'
]
];
const articles = [
'a',
'a', //
'an',
'the'
]
];
const prepositions = [
'aboard',
@ -84,10 +84,6 @@ const prepositions = [
'with',
'within',
'without'
]
];
module.exports = new Set([
...conjunctions,
...articles,
...prepositions
])
module.exports = new Set([...conjunctions, ...articles, ...prepositions]);

2
packages/loot-core/src/server/accounts/transaction-rules.js
View file

@ -17,13 +17,11 @@ import {
sortNumbers,
getApproxNumberThreshold
} from '../../shared/rules';
import q from '../../shared/query';
import { requiredFields, toDateRepr } from '../models';
import { currentDay } from '../../shared/months';
import { partitionByField, fastSetMerge } from '../../shared/util';
import { setSyncingMode, batchMessages } from '../sync';
import { schemaConfig } from '../aql/schema';
const uuid = require('../../platform/uuid');
// TODO: Detect if it looks like the user is creating a rename rule
// and prompt to create it in the pre phase instead

2
packages/loot-core/src/server/accounts/transaction-rules.test.js
View file

@ -1,5 +1,4 @@
import * as db from '../db';
import { Rule } from './rules';
import {
getRules,
loadRules,
@ -15,7 +14,6 @@ import {
migrateOldRules
} from './transaction-rules';
import { loadMappings } from '../db/mappings';
import { applyMigration } from '../migrate/migrations';
import { runQuery } from '../aql/schema/run-query';
import q from '../../shared/query';

7
packages/loot-core/src/server/accounts/transactions.js
View file

@ -1,4 +1,3 @@
import * as sheet from '../sheet';
import { batchMessages } from '../sync';
import * as db from '../db';
import { incrFetch, whereIn } from '../db/util';
@ -117,9 +116,9 @@ export async function batchUpdateTransactions({
await Promise.all(allAdded.map(t => transfer.onInsert(t)));
// Return any updates from here
resultUpdated = (await Promise.all(
allUpdated.map(t => transfer.onUpdate(t))
)).filter(Boolean);
resultUpdated = (
await Promise.all(allUpdated.map(t => transfer.onUpdate(t)))
).filter(Boolean);
await Promise.all(allDeleted.map(t => transfer.onDelete(t)));
});

37
packages/loot-core/src/server/accounts/transfer.js
View file

@ -6,24 +6,28 @@ async function getPayee(acct) {
async function getTransferredAccount(transaction) {
if (transaction.payee) {
let { transfer_acct, id } = await db.first(
'SELECT id, transfer_acct FROM v_payees WHERE id = ?',
[transaction.payee]
);
let {
transfer_acct,
id
} = await db.first('SELECT id, transfer_acct FROM v_payees WHERE id = ?', [
transaction.payee
]);
return transfer_acct;
}
return null;
}
async function clearCategory(transaction, transferAcct) {
const { offbudget: fromOffBudget } = await db.first(
'SELECT offbudget FROM accounts WHERE id = ?',
[transaction.account]
);
const { offbudget: toOffBudget } = await db.first(
'SELECT offbudget FROM accounts WHERE id = ?',
[transferAcct]
);
const {
offbudget: fromOffBudget
} = await db.first('SELECT offbudget FROM accounts WHERE id = ?', [
transaction.account
]);
const {
offbudget: toOffBudget
} = await db.first('SELECT offbudget FROM accounts WHERE id = ?', [
transferAcct
]);
// We should clear the category to make sure it's not being
// accounted for in the budget, unless it should be in the case of
@ -36,10 +40,11 @@ async function clearCategory(transaction, transferAcct) {
}
export async function addTransfer(transaction, transferredAccount) {
let { id: fromPayee } = await db.first(
'SELECT id FROM payees WHERE transfer_acct = ?',
[transaction.account]
);
let {
id: fromPayee
} = await db.first('SELECT id FROM payees WHERE transfer_acct = ?', [
transaction.account
]);
// We need to enforce certain constraints with child transaction transfers
if (transaction.parent_id) {

6
packages/loot-core/src/server/api.js
View file

@ -1,6 +1,5 @@
import { addTransactions } from './accounts/sync';
import {
transactionModel,
accountModel,
categoryModel,
categoryGroupModel,
@ -16,17 +15,14 @@ import * as db from './db';
import * as sheet from './sheet';
import * as prefs from './prefs';
import * as monthUtils from '../shared/months';
import * as update from './update';
import * as cloudStorage from './cloud-storage';
import { setSyncingMode, batchMessages } from './sync';
import { groupById, cleanUUID } from '../shared/util';
import { getClock } from './timestamp';
import { getClock } from './crdt';
import { runMutator } from './mutators';
import { integerToAmount } from '../shared/util';
import { runQuery as aqlQuery } from './aql/schema/run-query';
import q from '../shared/query';
const { resolveName } = require('./spreadsheet/util');
const connection = require('../platform/server/connection');
let IMPORT_MODE = false;

86
packages/loot-core/src/server/aql/exec.test.js
View file

@ -81,28 +81,34 @@ describe('runQuery', () => {
expect(data[0].date).toBe('2020-01-04');
// date-month
data = (await runQuery(
query('transactions')
.select({ month: { $month: '$date' } })
.serialize()
)).data;
data = (
await runQuery(
query('transactions')
.select({ month: { $month: '$date' } })
.serialize()
)
).data;
expect(data[0].month).toBe('2020-01');
// date-year
data = (await runQuery(
query('transactions')
.select({ year: { $year: '$date' } })
.serialize()
)).data;
data = (
await runQuery(
query('transactions')
.select({ year: { $year: '$date' } })
.serialize()
)
).data;
expect(data[0].year).toBe('2020');
// boolean
data = (await runQuery(
query('transactions')
.select(['is_child', 'is_parent'])
.raw()
.serialize()
)).data;
data = (
await runQuery(
query('transactions')
.select(['is_child', 'is_parent'])
.raw()
.serialize()
)
).data;
expect(data[0].is_child).toBe(false);
expect(data[0].is_parent).toBe(true);
expect(data[1].is_child).toBe(true);
@ -128,31 +134,37 @@ describe('runQuery', () => {
);
expect(data[0].id).toBe(transId);
data = (await runQuery(
query('transactions')
.filter({ date: { $transform: '$month', $eq: { $month: ':month' } } })
.select('date')
.serialize(),
{ params: { month: '2020-01-02' } }
)).data;
data = (
await runQuery(
query('transactions')
.filter({ date: { $transform: '$month', $eq: { $month: ':month' } } })
.select('date')
.serialize(),
{ params: { month: '2020-01-02' } }
)
).data;
expect(data[0].id).toBe(transId);
data = (await runQuery(
query('transactions')
.filter({ date: { $transform: '$year', $eq: { $year: ':month' } } })
.select('date')
.serialize(),
{ params: { month: '2020-01-02' } }
)).data;
data = (
await runQuery(
query('transactions')
.filter({ date: { $transform: '$year', $eq: { $year: ':month' } } })
.select('date')
.serialize(),
{ params: { month: '2020-01-02' } }
)
).data;
expect(data[0].id).toBe(transId);
data = (await runQuery(
query('transactions')
.filter({ cleared: ':cleared' })
.select('date')
.serialize(),
{ params: { cleared: true } }
)).data;
data = (
await runQuery(
query('transactions')
.filter({ cleared: ':cleared' })
.select('date')
.serialize(),
{ params: { cleared: true } }
)
).data;
expect(data[0].id).toBe(transId);
});

6
packages/loot-core/src/server/aql/schema/executors.js
View file

@ -1,6 +1,5 @@
import * as db from '../../db';
import { whereIn } from '../../db/util';
import { groupBy } from '../../../shared/util';
import { isAggregateQuery } from '../compiler';
import { convertOutputType } from '../schema-helpers';
import { execQuery } from '../exec';
@ -143,7 +142,10 @@ async function execTransactionsGrouped(
rows = await db.all(rowSql, params);
matched = new Set(
[].concat.apply([], rows.map(row => row.matched.split(',')))
[].concat.apply(
[],
rows.map(row => row.matched.split(','))
)
);
}

8
packages/loot-core/src/server/aql/schema/executors.test.js
View file

@ -1,16 +1,12 @@
import fc from 'fast-check';
import * as db from '../../db';
import query from '../../../shared/query';
import { makeChild } from '../../../shared/transactions';
import { batchMessages, setSyncingMode } from '../../sync/index';
import { setClock } from '../../timestamp';
import { setClock } from '../../crdt';
import { groupById } from '../../../shared/util';
import arbs from '../../../mocks/arbitrary-schema';
import { isAggregateQuery } from '../compiler';
import { runQuery } from './run-query';
import { toGroup, isHappyPathQuery } from './executors';
const uuid = require('../../../platform/uuid');
import { isHappyPathQuery } from './executors';
beforeEach(global.emptyDatabase());

4
packages/loot-core/src/server/aql/schema/index.test.js
View file

@ -10,7 +10,7 @@ describe('schema', () => {
test('never returns transactions without a date', async () => {
expect((await db.all('SELECT * FROM transactions')).length).toBe(0);
expect((await db.all('SELECT * FROM v_transactions')).length).toBe(0);
await db.runQuery('INSERT INTO transactions (acct) VALUES (?)', ["foo"]);
await db.runQuery('INSERT INTO transactions (acct) VALUES (?)', ['foo']);
expect((await db.all('SELECT * FROM transactions')).length).toBe(1);
expect((await db.all('SELECT * FROM v_transactions')).length).toBe(0);
});
@ -28,7 +28,7 @@ describe('schema', () => {
expect((await db.all('SELECT * FROM v_transactions')).length).toBe(0);
await db.runQuery(
'INSERT INTO transactions (date, acct, isChild) VALUES (?, ?, ?)',
[20200101, "foo", 1]
[20200101, 'foo', 1]
);
expect((await db.all('SELECT * FROM transactions')).length).toBe(1);
expect((await db.all('SELECT * FROM v_transactions')).length).toBe(0);

1
packages/loot-core/src/server/budget/actions.js
View file

@ -1,7 +1,6 @@
import * as monthUtils from '../../shared/months';
import * as db from '../db';
import { batchMessages } from '../sync';
import { groupBySingle } from '../../shared/util';
import * as prefs from '../prefs';
import * as sheet from '../sheet';

1
packages/loot-core/src/server/budget/app.js
View file

@ -3,7 +3,6 @@ import { mutator } from '../mutators';
import { undoable } from '../undo';
import * as actions from './actions';
let app = createApp();
app.method('budget/budget-amount', mutator(undoable(actions.setBudget)));

1
packages/loot-core/src/server/budget/report.js
View file

@ -1,5 +1,4 @@
import * as sheet from '../sheet';
import * as monthUtils from '../../shared/months';
import { number, sumAmounts } from './util';
const { resolveName } = require('../spreadsheet/util');

1
packages/loot-core/src/server/budget/util.js
View file

@ -19,4 +19,3 @@ export function unflatten2(arr) {
}
return res;
}

0
packages/loot-core/src/server/__snapshots__/merkle.test.js.snap → packages/loot-core/src/server/crdt/__snapshots__/merkle.test.js.snap
View file

12
packages/loot-core/src/server/crdt/index.js Normal file
View file

@ -0,0 +1,12 @@
import * as merkle from './merkle';
export { merkle };
export {
getClock,
setClock,
makeClock,
makeClientId,
serializeClock,
deserializeClock,
Timestamp
} from './timestamp';

0
packages/loot-core/src/server/merkle.js → packages/loot-core/src/server/crdt/merkle.js
View file

2
packages/loot-core/src/server/merkle.test.js → packages/loot-core/src/server/crdt/merkle.test.js
View file

@ -1,5 +1,5 @@
import * as merkle from './merkle';
import Timestamp from './timestamp';
import { Timestamp } from './timestamp';
function pretty(n) {
if (n < 60) {

6
packages/loot-core/src/server/timestamp.js → packages/loot-core/src/server/crdt/timestamp.js
View file

@ -1,5 +1,5 @@
import murmurhash from 'murmurhash';
const uuid = require('../platform/uuid');
const uuid = require('../../platform/uuid');
/**
* Hybrid Unique Logical Clock (HULC) timestamp generator
@ -81,7 +81,7 @@ const MAX_NODE_LENGTH = 16;
/**
* timestamp instance class
*/
export default class Timestamp {
export class Timestamp {
constructor(millis, counter, node) {
this._state = {
millis: millis,
@ -124,7 +124,7 @@ export default class Timestamp {
}
}
export class MutableTimestamp extends Timestamp {
class MutableTimestamp extends Timestamp {
setMillis(n) {
this._state.millis = n;
}

2
packages/loot-core/src/server/timestamp.test.js → packages/loot-core/src/server/crdt/timestamp.test.js
View file

@ -1,4 +1,4 @@
import Timestamp, { setClock, makeClock } from './timestamp';
import { Timestamp } from './timestamp';
describe('Timestamp', function() {
let now = 0;

7
packages/loot-core/src/server/db/index.js
View file

@ -11,13 +11,14 @@ import {
payeeRuleModel
} from '../models';
import { groupById } from '../../shared/util';
import Timestamp, {
import {
makeClock,
setClock,
serializeClock,
deserializeClock,
makeClientId
} from '../timestamp';
makeClientId,
Timestamp
} from '../crdt';
import {
convertForInsert,
convertForUpdate,

132
packages/loot-core/src/server/main.js
View file

@ -1,5 +1,4 @@
import './polyfills';
import { differenceInDays } from 'date-fns';
import asyncStorage from '../platform/server/asyncStorage';
import { captureException, captureBreadcrumb } from '../platform/exceptions';
import * as prefs from './prefs';
@ -31,8 +30,16 @@ import * as bankSync from './accounts/sync';
import * as link from './accounts/link';
import { uniqueFileName, idFromFileName } from './util/budget-name';
import { mutator, runHandler } from './mutators';
import * as timestamp from './timestamp';
import * as merkle from './merkle';
import {
getClock,
setClock,
makeClock,
makeClientId,
serializeClock,
deserializeClock,
Timestamp,
merkle
} from './crdt';
import {
initialFullSync,
fullSync,
@ -416,7 +423,10 @@ handlers['category-group-delete'] = mutator(async function({ id, transferId }) {
return batchMessages(async () => {
if (transferId) {
await budget.doTransfer(groupCategories.map(c => c.id), transferId);
await budget.doTransfer(
groupCategories.map(c => c.id),
transferId
);
}
await db.deleteCategoryGroup({ id }, transferId);
});
@ -761,11 +771,15 @@ handlers['accounts-get'] = async function() {
};
handlers['account-properties'] = async function({ id }) {
const { balance } = await db.first(
const {
balance
} = await db.first(
'SELECT sum(amount) as balance FROM transactions WHERE acct = ? AND isParent = 0 AND tombstone = 0',
[id]
);
const { count } = await db.first(
const {
count
} = await db.first(
'SELECT count(id) as count FROM transactions WHERE acct = ? AND tombstone = 0',
[id]
);
@ -904,10 +918,9 @@ handlers['account-close'] = mutator(async function({
true
);
let { id: payeeId } = await db.first(
'SELECT id FROM payees WHERE transfer_acct = ?',
[id]
);
let {
id: payeeId
} = await db.first('SELECT id FROM payees WHERE transfer_acct = ?', [id]);
await batchMessages(() => {
// TODO: what this should really do is send a special message that
@ -941,10 +954,11 @@ handlers['account-close'] = mutator(async function({
// If there is a balance we need to transfer it to the specified
// account (and possibly categorize it)
if (balance !== 0) {
let { id: payeeId } = await db.first(
'SELECT id FROM payees WHERE transfer_acct = ?',
[transferAccountId]
);
let {
id: payeeId
} = await db.first('SELECT id FROM payees WHERE transfer_acct = ?', [
transferAccountId
]);
await handlers['transaction-add']({
id: uuid.v4Sync(),
@ -1084,9 +1098,7 @@ handlers['accounts-sync'] = async function({ id }) {
} else if (err instanceof PostError && err.reason !== 'internal') {
errors.push({
accountId: acct.id,
message: `Account "${
acct.name
}" is not linked properly. Please link it again`
message: `Account "${acct.name}" is not linked properly. Please link it again`
});
} else {
errors.push({
@ -1136,10 +1148,9 @@ handlers['transactions-import'] = mutator(function({
});
handlers['account-unlink'] = mutator(async function({ id }) {
let { bank: bankId } = await db.first(
'SELECT bank FROM accounts WHERE id = ?',
[id]
);
let {
bank: bankId
} = await db.first('SELECT bank FROM accounts WHERE id = ?', [id]);
if (!bankId) {
return 'ok';
@ -1154,10 +1165,11 @@ handlers['account-unlink'] = mutator(async function({ id }) {
balance_limit: null
});
let { count } = await db.first(
'SELECT COUNT(*) as count FROM accounts WHERE bank = ?',
[bankId]
);
let {
count
} = await db.first('SELECT COUNT(*) as count FROM accounts WHERE bank = ?', [
bankId
]);
if (count === 0) {
// No more accounts are associated with this bank. We can remove
@ -1547,35 +1559,37 @@ handlers['get-version'] = async function() {
handlers['get-budgets'] = async function() {
const paths = await fs.listDir(fs.getDocumentDir());
const budgets = (await Promise.all(
paths.map(async name => {
const prefsPath = fs.join(fs.getDocumentDir(), name, 'metadata.json');
if (await fs.exists(prefsPath)) {
let prefs;
try {
prefs = JSON.parse(await fs.readFile(prefsPath));
} catch (e) {
console.log('Error parsing metadata:', e.stack);
return;
const budgets = (
await Promise.all(
paths.map(async name => {
const prefsPath = fs.join(fs.getDocumentDir(), name, 'metadata.json');
if (await fs.exists(prefsPath)) {
let prefs;
try {
prefs = JSON.parse(await fs.readFile(prefsPath));
} catch (e) {
console.log('Error parsing metadata:', e.stack);
return;
}
// We treat the directory name as the canonical id so that if
// the user moves it around/renames/etc, nothing breaks. The
// id is stored in prefs just for convenience (and the prefs
// will always update to the latest given id)
if (name !== DEMO_BUDGET_ID) {
return {
id: name,
cloudFileId: prefs.cloudFileId,
groupId: prefs.groupId,
name: prefs.budgetName || '(no name)'
};
}
}
// We treat the directory name as the canonical id so that if
// the user moves it around/renames/etc, nothing breaks. The
// id is stored in prefs just for convenience (and the prefs
// will always update to the latest given id)
if (name !== DEMO_BUDGET_ID) {
return {
id: name,
cloudFileId: prefs.cloudFileId,
groupId: prefs.groupId,
name: prefs.budgetName || '(no name)'
};
}
}
return null;
})
)).filter(x => x);
return null;
})
)
).filter(x => x);
return budgets;
};
@ -1969,10 +1983,10 @@ async function loadBudget(id, appVersion, { showUpdate } = {}) {
//
// TODO: The client id should be stored elsewhere. It shouldn't
// work this way, but it's fine for now.
timestamp.getClock().timestamp.setNode(timestamp.makeClientId());
getClock().timestamp.setNode(makeClientId());
await db.runQuery(
'INSERT OR REPLACE INTO messages_clock (id, clock) VALUES (1, ?)',
[timestamp.serializeClock(timestamp.getClock())]
[serializeClock(getClock())]
);
await prefs.savePrefs({ resetClock: false });
@ -2254,7 +2268,15 @@ export const lib = {
// Expose CRDT mechanisms so server can use them
merkle,
timestamp,
timestamp: {
getClock,
setClock,
makeClock,
makeClientId,
serializeClock,
deserializeClock,
Timestamp
},
SyncProtoBuf: SyncPb
};

2
packages/loot-core/src/server/main.test.js
View file

@ -3,7 +3,7 @@ import * as prefs from './prefs';
import * as db from './db';
import * as budget from './budget/base';
import * as monthUtils from '../shared/months';
import { getClock, deserializeClock } from './timestamp';
import { getClock, deserializeClock } from './crdt';
import {
runHandler,
runMutator,

3
packages/loot-core/src/server/migrate/migrations.test.js
View file

@ -3,8 +3,7 @@ import {
withMigrationsDir,
getAppliedMigrations,
getMigrationList,
getPending,
applyMigration
getPending
} from './migrations';
import * as db from '../db';

2
packages/loot-core/src/server/polyfills.mobile.js
View file

@ -1,2 +1,2 @@
// Mobile needs this
import 'core-js/modules/es.object.from-entries'
import 'core-js/modules/es.object.from-entries';

2
packages/loot-core/src/server/post.js
View file

@ -1,5 +1,5 @@
import Platform from './platform';
const { PostError, HTTPError } = require('./errors');
const { PostError } = require('./errors');
const { fetch } = require('../platform/server/fetch');
function throwIfNot200(res, text) {

2
packages/loot-core/src/server/prefs.js
View file

@ -1,5 +1,5 @@
import { sendMessages } from './sync';
import Timestamp from './timestamp';
import { Timestamp } from './crdt';
const fs = require('../platform/server/fs');
let prefs = null;

2
packages/loot-core/src/server/schedules/app.js
View file

@ -5,8 +5,6 @@ import * as db from '../db';
import * as prefs from '../prefs';
import { toDateRepr } from '../models';
import { runQuery as aqlQuery } from '../aql/schema/run-query';
import { compileQuery } from '../aql/compiler';
import { schema, schemaConfig } from '../aql/schema';
import { dayFromDate, currentDay, parseDate } from '../../shared/months';
import q from '../../shared/query';
import {

37
packages/loot-core/src/server/schedules/app.test.js
View file

@ -1,4 +1,3 @@
import * as db from '../db';
import { runQuery as aqlQuery } from '../aql/schema/run-query';
import q from '../../shared/query';
import { loadRules, updateRule } from '../accounts/transaction-rules';
@ -6,7 +5,6 @@ import { loadMappings } from '../db/mappings';
import {
updateConditions,
getNextDate,
listSchedules,
createSchedule,
updateSchedule,
deleteSchedule,
@ -73,7 +71,10 @@ describe('schedule app', () => {
value: {
start: '2020-12-20',
frequency: 'monthly',
patterns: [{ type: 'day', value: 15 }, { type: 'day', value: 30 }]
patterns: [
{ type: 'day', value: 15 },
{ type: 'day', value: 30 }
]
}
})
).toBe('2021-05-30');
@ -90,7 +91,10 @@ describe('schedule app', () => {
value: {
start: '2020-12-20',
frequency: 'monthly',
patterns: [{ type: 'day', value: 15 }, { type: 'day', value: 30 }]
patterns: [
{ type: 'day', value: 15 },
{ type: 'day', value: 30 }
]
}
}
]
@ -125,7 +129,10 @@ describe('schedule app', () => {
value: {
start: '2020-12-20',
frequency: 'monthly',
patterns: [{ type: 'day', value: 15 }, { type: 'day', value: 30 }]
patterns: [
{ type: 'day', value: 15 },
{ type: 'day', value: 30 }
]
}
}
]
@ -152,7 +159,10 @@ describe('schedule app', () => {
value: {
start: '2020-12-20',
frequency: 'monthly',
patterns: [{ type: 'day', value: 18 }, { type: 'day', value: 29 }]
patterns: [
{ type: 'day', value: 18 },
{ type: 'day', value: 29 }
]
}
}
]
@ -179,7 +189,10 @@ describe('schedule app', () => {
value: {
start: '2020-12-20',
frequency: 'monthly',
patterns: [{ type: 'day', value: 15 }, { type: 'day', value: 30 }]
patterns: [
{ type: 'day', value: 15 },
{ type: 'day', value: 30 }
]
}
}
]
@ -202,7 +215,10 @@ describe('schedule app', () => {
value: {
start: '2020-12-20',
frequency: 'monthly',
patterns: [{ type: 'day', value: 15 }, { type: 'day', value: 30 }]
patterns: [
{ type: 'day', value: 15 },
{ type: 'day', value: 30 }
]
}
}
]
@ -224,7 +240,10 @@ describe('schedule app', () => {
value: {
start: '2020-12-20',
frequency: 'monthly',
patterns: [{ type: 'day', value: 18 }, { type: 'day', value: 28 }]
patterns: [
{ type: 'day', value: 18 },
{ type: 'day', value: 28 }
]
}
}
]

12
packages/loot-core/src/server/schedules/find-schedules.js
View file

@ -7,7 +7,7 @@ import { runQuery as aqlQuery } from '../aql/schema/run-query';
import q from '../../shared/query';
import { getApproxNumberThreshold } from '../../shared/rules';
import { recurConfigToRSchedule } from '../../shared/schedules';
import { dayFromDate, parseDate, subDays } from '../../shared/months';
import { dayFromDate, parseDate } from '../../shared/months';
import { conditionsToAQL } from '../accounts/transaction-rules';
const uuid = require('../../platform/uuid');
@ -219,7 +219,10 @@ async function monthly1stor3rd(startDate, accountId) {
return {
start,
frequency: 'monthly',
patterns: [{ type: dayValue, value: 1 }, { type: dayValue, value: 3 }]
patterns: [
{ type: dayValue, value: 1 },
{ type: dayValue, value: 3 }
]
};
},
accountId
@ -237,7 +240,10 @@ async function monthly2ndor4th(startDate, accountId) {
return {
start,
frequency: 'monthly',
patterns: [{ type: dayValue, value: 2 }, { type: dayValue, value: 4 }]
patterns: [
{ type: dayValue, value: 2 },
{ type: dayValue, value: 4 }
]
};
},
accountId

2
packages/loot-core/src/server/spreadsheet/new/parser.js
View file

@ -363,7 +363,7 @@ function parsePostfix(state, node) {
while ((tok = nextToken(state))) {
if (tok.type === types.TOKEN_LEFT_PAREN) {
pushToken(state, tok);
let args = parseArgs(state)
let args = parseArgs(state);
node = new nodes.FunCall(tok.lineno, tok.colno, node, args);
} else if (tok.type === types.TOKEN_DOT) {
const val = nextToken(state);

5
packages/loot-core/src/server/spreadsheet/new/sqlgen.js
View file

@ -1,5 +1,4 @@
import * as nodes from './nodes';
const uuid = require('../../../platform/uuid');
let _uid = 0;
function resetUid() {
@ -239,9 +238,7 @@ export default function generate(table, where, groupby, select, deps) {
joins.push(meta.sql(lookup.tableId));
} else {
joins.push(
`LEFT JOIN ${meta.table} ${lookup.tableId} ON ${
lookup.tableId
}.id = ${currentTable.id}.${lookup.field}`
`LEFT JOIN ${meta.table} ${lookup.tableId} ON ${lookup.tableId}.id = ${currentTable.id}.${lookup.field}`
);
}

9
packages/loot-core/src/server/spreadsheet/new/vm.js
View file

@ -1,5 +1,5 @@
import { compile, compileBinding } from './compiler';
import { MOV, CALL, QUERY, UOP, BOP, REG1, SP, VAR, JUMPF, JUMPT } from './ops';
import { compile } from './compiler';
import { MOV, CALL, QUERY, UOP, BOP, JUMPF, JUMPT } from './ops';
export default class VM {
constructor(db, scopes) {
@ -74,7 +74,10 @@ export default class VM {
call(callee, args) {
const func = this.get(callee);
this.reg1 = func.apply(null, args.map(arg => this.get(arg)));
this.reg1 = func.apply(
null,
args.map(arg => this.get(arg))
);
}
query(sql, calculated) {

10
packages/loot-core/src/server/spreadsheet/tests/data-propagation.js
View file

@ -1,10 +1,8 @@
const expect = require('expect');
const propagate = require('../data-compute/propagate.js');
const expect = require("expect");
const propagate = require("../data-compute/propagate.js");
describe("data propagation", () => {
it("should work", () => {
describe('data propagation', () => {
it('should work', () => {
expect(true).toExist();
});
});

340
packages/loot-core/src/server/spreadsheet/tests/graph.js
View file

@ -1,308 +1,304 @@
// Unit tests for reactive-property.
var assert = require("assert");
var assert = require('assert');
// If using from the NPM package, this line would be
// var Graph = require("graph-data-structure");
var Graph = require("../data-compute/graph-data-structure");
var Graph = require('../data-compute/graph-data-structure');
describe("Graph", function() {
describe("Data structure", function() {
it("Should add nodes and list them.", function (){
describe('Graph', function() {
describe('Data structure', function() {
it('Should add nodes and list them.', function() {
var graph = Graph();
graph.addNode("a");
graph.addNode("b");
graph.addNode('a');
graph.addNode('b');
assert.equal(graph.nodes().length, 2);
assert(contains(graph.nodes(), "a"));
assert(contains(graph.nodes(), "b"));
assert(contains(graph.nodes(), 'a'));
assert(contains(graph.nodes(), 'b'));
});
it("Should chain addNode.", function (){
var graph = Graph().addNode("a").addNode("b");
it('Should chain addNode.', function() {
var graph = Graph()
.addNode('a')
.addNode('b');
assert.equal(graph.nodes().length, 2);
assert(contains(graph.nodes(), "a"));
assert(contains(graph.nodes(), "b"));
assert(contains(graph.nodes(), 'a'));
assert(contains(graph.nodes(), 'b'));
});
it("Should remove nodes.", function (){
it('Should remove nodes.', function() {
var graph = Graph();
graph.addNode("a");
graph.addNode("b");
graph.removeNode("a");
graph.removeNode("b");
graph.addNode('a');
graph.addNode('b');
graph.removeNode('a');
graph.removeNode('b');
assert.equal(graph.nodes().length, 0);
});
it("Should chain removeNode.", function (){
it('Should chain removeNode.', function() {
var graph = Graph()
.addNode("a")
.addNode("b")
.removeNode("a")
.removeNode("b");
.addNode('a')
.addNode('b')
.removeNode('a')
.removeNode('b');
assert.equal(graph.nodes().length, 0);
});
it("Should add edges and query for adjacent nodes.", function (){
it('Should add edges and query for adjacent nodes.', function() {
var graph = Graph();
graph.addNode("a");
graph.addNode("b");
graph.addEdge("a", "b");
assert.equal(graph.adjacent("a").length, 1);
assert.equal(graph.adjacent("a")[0], "b");
graph.addNode('a');
graph.addNode('b');
graph.addEdge('a', 'b');
assert.equal(graph.adjacent('a').length, 1);
assert.equal(graph.adjacent('a')[0], 'b');
});
it("Should implicitly add nodes when edges are added.", function (){
it('Should implicitly add nodes when edges are added.', function() {
var graph = Graph();
graph.addEdge("a", "b");
assert.equal(graph.adjacent("a").length, 1);
assert.equal(graph.adjacent("a")[0], "b");
graph.addEdge('a', 'b');
assert.equal(graph.adjacent('a').length, 1);
assert.equal(graph.adjacent('a')[0], 'b');
assert.equal(graph.nodes().length, 2);
assert(contains(graph.nodes(), "a"));
assert(contains(graph.nodes(), "b"));
assert(contains(graph.nodes(), 'a'));
assert(contains(graph.nodes(), 'b'));
});
it("Should chain addEdge.", function (){
var graph = Graph().addEdge("a", "b");
assert.equal(graph.adjacent("a").length, 1);
assert.equal(graph.adjacent("a")[0], "b");
it('Should chain addEdge.', function() {
var graph = Graph().addEdge('a', 'b');
assert.equal(graph.adjacent('a').length, 1);
assert.equal(graph.adjacent('a')[0], 'b');
});
it("Should remove edges.", function (){
it('Should remove edges.', function() {
var graph = Graph();
graph.addEdge("a", "b");
graph.removeEdge("a", "b");
assert.equal(graph.adjacent("a").length, 0);
graph.addEdge('a', 'b');
graph.removeEdge('a', 'b');
assert.equal(graph.adjacent('a').length, 0);
});
it("Should chain removeEdge.", function (){
it('Should chain removeEdge.', function() {
var graph = Graph()
.addEdge("a", "b")
.removeEdge("a", "b");
assert.equal(graph.adjacent("a").length, 0);
.addEdge('a', 'b')
.removeEdge('a', 'b');
assert.equal(graph.adjacent('a').length, 0);
});
it("Should not remove nodes when edges are removed.", function (){
it('Should not remove nodes when edges are removed.', function() {
var graph = Graph();
graph.addEdge("a", "b");
graph.removeEdge("a", "b");
graph.addEdge('a', 'b');
graph.removeEdge('a', 'b');
assert.equal(graph.nodes().length, 2);
assert(contains(graph.nodes(), "a"));
assert(contains(graph.nodes(), "b"));
assert(contains(graph.nodes(), 'a'));
assert(contains(graph.nodes(), 'b'));
});
it("Should remove outgoing edges when a node is removed.", function (){
it('Should remove outgoing edges when a node is removed.', function() {
var graph = Graph();
graph.addEdge("a", "b");
graph.removeNode("a");
assert.equal(graph.adjacent("a").length, 0);
graph.addEdge('a', 'b');
graph.removeNode('a');
assert.equal(graph.adjacent('a').length, 0);
});
it("Should remove incoming edges when a node is removed.", function (){
it('Should remove incoming edges when a node is removed.', function() {
var graph = Graph();
graph.addEdge("a", "b");
graph.removeNode("b");
assert.equal(graph.adjacent("a").length, 0);
graph.addEdge('a', 'b');
graph.removeNode('b');
assert.equal(graph.adjacent('a').length, 0);
});
it("Should compute indegree.", function (){
it('Should compute indegree.', function() {
var graph = Graph();
graph.addEdge("a", "b");
assert.equal(graph.indegree("a"), 0);
assert.equal(graph.indegree("b"), 1);
graph.addEdge('a', 'b');
assert.equal(graph.indegree('a'), 0);
assert.equal(graph.indegree('b'), 1);
graph.addEdge("c", "b");
assert.equal(graph.indegree("b"), 2);
graph.addEdge('c', 'b');
assert.equal(graph.indegree('b'), 2);
});
it("Should compute outdegree.", function (){
it('Should compute outdegree.', function() {
var graph = Graph();
graph.addEdge("a", "b");
assert.equal(graph.outdegree("a"), 1);
assert.equal(graph.outdegree("b"), 0);
graph.addEdge('a', 'b');
assert.equal(graph.outdegree('a'), 1);
assert.equal(graph.outdegree('b'), 0);
graph.addEdge("a", "c");
assert.equal(graph.outdegree("a"), 2);
graph.addEdge('a', 'c');
assert.equal(graph.outdegree('a'), 2);
});
});
describe("Algorithms", function() {
describe('Algorithms', function() {
// This example is from Cormen et al. "Introduction to Algorithms" page 550
it("Should compute topological sort.", function (){
it('Should compute topological sort.', function() {
var graph = Graph();
// Shoes depend on socks.
// Socks need to be put on before shoes.
graph.addEdge("socks", "shoes");
graph.addEdge('socks', 'shoes');
graph.addEdge("shirt", "belt");
graph.addEdge("shirt", "tie");
graph.addEdge("tie", "jacket");
graph.addEdge("belt", "jacket");
graph.addEdge("pants", "shoes");
graph.addEdge("underpants", "pants");
graph.addEdge("pants", "belt");
graph.addEdge('shirt', 'belt');
graph.addEdge('shirt', 'tie');
graph.addEdge('tie', 'jacket');
graph.addEdge('belt', 'jacket');
graph.addEdge('pants', 'shoes');
graph.addEdge('underpants', 'pants');
graph.addEdge('pants', 'belt');
var sorted = graph.topologicalSort();
assert(comesBefore(sorted, "pants", "shoes"));
assert(comesBefore(sorted, "underpants", "pants"));
assert(comesBefore(sorted, "underpants", "shoes"));
assert(comesBefore(sorted, "shirt", "jacket"));
assert(comesBefore(sorted, "shirt", "belt"));
assert(comesBefore(sorted, "belt", "jacket"));
assert(comesBefore(sorted, 'pants', 'shoes'));
assert(comesBefore(sorted, 'underpants', 'pants'));
assert(comesBefore(sorted, 'underpants', 'shoes'));
assert(comesBefore(sorted, 'shirt', 'jacket'));
assert(comesBefore(sorted, 'shirt', 'belt'));
assert(comesBefore(sorted, 'belt', 'jacket'));
assert.equal(sorted.length, 8);
});
it("Should compute topological sort, excluding source nodes.", function (){
it('Should compute topological sort, excluding source nodes.', function() {
var graph = Graph();
graph.addEdge("a", "b");
graph.addEdge("b", "c");
var sorted = graph.topologicalSort(["a"], false);
graph.addEdge('a', 'b');
graph.addEdge('b', 'c');
var sorted = graph.topologicalSort(['a'], false);
assert.equal(sorted.length, 2);
assert.equal(sorted[0], "b");
assert.equal(sorted[1], "c");
assert.equal(sorted[0], 'b');
assert.equal(sorted[1], 'c');
});
it("Should compute topological sort tricky case.", function (){
it('Should compute topological sort tricky case.', function() {
var graph = Graph(); // a
// / \
graph.addEdge('a', 'b'); // b |
graph.addEdge('a', 'd'); // | d
graph.addEdge('b', 'c'); // c |
graph.addEdge('d', 'e'); // \ /
graph.addEdge('c', 'e'); // e
var graph = Graph(); // a
// / \
graph.addEdge("a", "b"); // b |
graph.addEdge("a", "d"); // | d
graph.addEdge("b", "c"); // c |
graph.addEdge("d", "e"); // \ /
graph.addEdge("c", "e"); // e
var sorted = graph.topologicalSort(["a"], false);
var sorted = graph.topologicalSort(['a'], false);
assert.equal(sorted.length, 4);
assert(contains(sorted, "b"));
assert(contains(sorted, "c"));
assert(contains(sorted, "d"));
assert.equal(sorted[sorted.length - 1], "e");
assert(comesBefore(sorted, "b", "c"));
assert(comesBefore(sorted, "b", "e"));
assert(comesBefore(sorted, "c", "e"));
assert(comesBefore(sorted, "d", "e"));
assert(contains(sorted, 'b'));
assert(contains(sorted, 'c'));
assert(contains(sorted, 'd'));
assert.equal(sorted[sorted.length - 1], 'e');
assert(comesBefore(sorted, 'b', 'c'));
assert(comesBefore(sorted, 'b', 'e'));
assert(comesBefore(sorted, 'c', 'e'));
assert(comesBefore(sorted, 'd', 'e'));
});
it("Should exclude source nodes with a cycle.", function (){
it('Should exclude source nodes with a cycle.', function() {
var graph = Graph()
.addEdge("a", "b")
.addEdge("b", "c")
.addEdge("c", "a");
var sorted = graph.topologicalSort(["a"], false);
.addEdge('a', 'b')
.addEdge('b', 'c')
.addEdge('c', 'a');
var sorted = graph.topologicalSort(['a'], false);
assert.equal(sorted.length, 2);
assert.equal(sorted[0], "b");
assert.equal(sorted[1], "c");
assert.equal(sorted[0], 'b');
assert.equal(sorted[1], 'c');
});
it("Should exclude source nodes with multiple cycles.", function (){
it('Should exclude source nodes with multiple cycles.', function() {
var graph = Graph()
.addEdge('a', 'b')
.addEdge('b', 'a')
.addEdge("a", "b")
.addEdge("b", "a")
.addEdge('b', 'c')
.addEdge('c', 'b')
.addEdge("b", "c")
.addEdge("c", "b")
.addEdge('a', 'c')
.addEdge('c', 'a');
.addEdge("a", "c")
.addEdge("c", "a");
var sorted = graph.topologicalSort(["a", "b"], false);
assert(!contains(sorted, "b"));
var sorted = graph.topologicalSort(['a', 'b'], false);
assert(!contains(sorted, 'b'));
});
});
describe("Edge cases and error handling", function() {
it("Should return empty array of adjacent nodes for unknown nodes.", function (){
describe('Edge cases and error handling', function() {
it('Should return empty array of adjacent nodes for unknown nodes.', function() {
var graph = Graph();
assert.equal(graph.adjacent("a").length, 0);
assert.equal(graph.adjacent('a').length, 0);
assert.equal(graph.nodes(), 0);
});
it("Should do nothing if removing an edge that does not exist.", function (){
assert.doesNotThrow(function (){
it('Should do nothing if removing an edge that does not exist.', function() {
assert.doesNotThrow(function() {
var graph = Graph();
graph.removeEdge("a", "b");
graph.removeEdge('a', 'b');
});
});
it("Should return indegree of 0 for unknown nodes.", function (){
it('Should return indegree of 0 for unknown nodes.', function() {
var graph = Graph();
assert.equal(graph.indegree("z"), 0);
assert.equal(graph.indegree('z'), 0);
});
it("Should return outdegree of 0 for unknown nodes.", function (){
it('Should return outdegree of 0 for unknown nodes.', function() {
var graph = Graph();
assert.equal(graph.outdegree("z"), 0);
assert.equal(graph.outdegree('z'), 0);
});
});
describe("Serialization", function() {
describe('Serialization', function() {
var serialized;
function checkSerialized(graph){
function checkSerialized(graph) {
assert.equal(graph.nodes.length, 3);
assert.equal(graph.links.length, 2);
assert.equal(graph.nodes[0].id, "a");
assert.equal(graph.nodes[1].id, "b");
assert.equal(graph.nodes[2].id, "c");
assert.equal(graph.nodes[0].id, 'a');
assert.equal(graph.nodes[1].id, 'b');
assert.equal(graph.nodes[2].id, 'c');
assert.equal(graph.links[0].source, "a");
assert.equal(graph.links[0].target, "b");
assert.equal(graph.links[1].source, "b");
assert.equal(graph.links[1].target, "c");
assert.equal(graph.links[0].source, 'a');
assert.equal(graph.links[0].target, 'b');
assert.equal(graph.links[1].source, 'b');
assert.equal(graph.links[1].target, 'c');
}
it("Should serialize a graph.", function (){
it('Should serialize a graph.', function() {
var graph = Graph()
.addEdge("a", "b")
.addEdge("b", "c");
.addEdge('a', 'b')
.addEdge('b', 'c');
serialized = graph.serialize();
checkSerialized(serialized);
});
it("Should deserialize a graph.", function (){
it('Should deserialize a graph.', function() {
var graph = Graph();
graph.deserialize(serialized);
checkSerialized(graph.serialize());
});
it("Should chain deserialize a graph.", function (){
it('Should chain deserialize a graph.', function() {
var graph = Graph().deserialize(serialized);
checkSerialized(graph.serialize());
});
it("Should deserialize a graph passed to constructor.", function (){
it('Should deserialize a graph passed to constructor.', function() {
var graph = Graph(serialized);
checkSerialized(graph.serialize());
});
});
});
function contains(arr, item){
return arr.filter(function (d){
return d === item;
}).length > 0;
function contains(arr, item) {
return (
arr.filter(function(d) {
return d === item;
}).length > 0
);
}
function comesBefore(arr, a, b){
function comesBefore(arr, a, b) {
var aIndex, bIndex;
arr.forEach(function (d, i){
if(d === a){ aIndex = i; }
if(d === b){ bIndex = i; }
arr.forEach(function(d, i) {
if (d === a) {
aIndex = i;
}
if (d === b) {
bIndex = i;
}
});
return aIndex < bIndex;
}

37
packages/loot-core/src/server/spreadsheet/usage.js
View file

@ -1,12 +1,12 @@
const sqlite = require("sqlite3");
const escodegen = require("escodegen");
const sqlgen = require("./sqlgen");
const sqlite = require('sqlite3');
const escodegen = require('escodegen');
const sqlgen = require('./sqlgen');
// Example usage:
const Spreadsheet = require("./spreadsheet");
const Spreadsheet = require('./spreadsheet');
const db = new sqlite.Database(__dirname + "/../../db.sqlite");
const db = new sqlite.Database(__dirname + '/../../db.sqlite');
const sheet = new Spreadsheet({
plugins: {
runQuery: {
@ -20,22 +20,24 @@ const sheet = new Spreadsheet({
return {
data: {
type: "query",
type: 'query',
query: query,
sql: sql
},
ast: {
type: "CallExpression",
type: 'CallExpression',
callee: {
type: "Identifier",
name: "runQuery"
type: 'Identifier',
name: 'runQuery'
},
arguments: [{
type: "Literal",
raw: sql,
value: sql
}]
arguments: [
{
type: 'Literal',
raw: sql,
value: sql
}
]
}
};
},
@ -43,7 +45,7 @@ const sheet = new Spreadsheet({
return new Promise(resolve => {
const start = Date.now();
db.all(sql, function(err, rows) {
if(err) {
if (err) {
throw new Error(err);
}
resolve(rows);
@ -54,11 +56,12 @@ const sheet = new Spreadsheet({
}
});
db.on("preupdate", function(type, dbname, table, old, _new, oldId, newId) {
db.on('preupdate', function(type, dbname, table, old, _new, oldId, newId) {
sheet.resolve().then(() => {
const start = Date.now();
sheet.startTransaction();
sheet.getNodesOfType("query")
sheet
.getNodesOfType('query')
.filter(node => node.data.query.table === table)
.forEach(q => {
sheet.signal(q.name);

10
packages/loot-core/src/server/sync/index.js
View file

@ -1,5 +1,4 @@
import { sequential, once } from '../../shared/async';
import * as perf from '../perf';
import * as prefs from '../prefs';
import app from '../main-app';
import asyncStorage from '../../platform/server/asyncStorage';
@ -12,12 +11,13 @@ import { triggerBudgetChanges, setType as setBudgetType } from '../budget/base';
import * as undo from '../undo';
import { runMutator } from '../mutators';
import { setIn, getIn } from '../../shared/util';
import Timestamp, {
import {
serializeClock,
deserializeClock,
getClock
} from '../timestamp';
import * as merkle from '../merkle';
getClock,
Timestamp,
merkle
} from '../crdt';
import * as encoder from './encoder';
import { getServer } from '../server-config';
import { rebuildMerkleHash } from './repair';

2
packages/loot-core/src/server/sync/migrate.js
View file

@ -1,5 +1,5 @@
import { addSyncListener, applyMessages } from './index';
import Timestamp from '../timestamp';
import { Timestamp } from '../crdt';
function migrateParentIds(oldValues, newValues) {
newValues.forEach((items, table) => {

5
packages/loot-core/src/server/sync/migrate.test.js
View file

@ -1,12 +1,11 @@
import fc from 'fast-check';
import * as db from '../db';
import { migrateParentIds, listen, unlisten } from './migrate';
import { addSyncListener, batchMessages, sendMessages } from './index';
import { listen, unlisten } from './migrate';
import { addSyncListener, sendMessages } from './index';
import { execTracer } from '../../shared/test-helpers';
import { schema, schemaConfig } from '../aql/schema';
import arbs from '../../mocks/arbitrary-schema';
import { convertInputType } from '../aql/schema-helpers';
import { groupBy } from '../../shared/util';
beforeEach(() => {
listen();

3
packages/loot-core/src/server/sync/repair.js
View file

@ -1,6 +1,5 @@
import * as db from '../db';
import Timestamp, { serializeClock, getClock } from '../timestamp';
import * as merkle from '../merkle';
import { serializeClock, getClock, Timestamp, merkle } from '../crdt';
export function rebuildMerkleHash() {
let rows = db.runQuery('SELECT timestamp FROM messages_crdt', [], true);

18
packages/loot-core/src/server/sync/sync.property.test.js
View file

@ -2,16 +2,13 @@ import * as prefs from '../prefs';
import * as db from '../db';
import * as sheet from '../sheet';
import * as sync from './index';
import Timestamp, { deserializeClock, getClock } from '../timestamp';
import * as merkle from '../merkle';
import { merkle, getClock, Timestamp } from '../crdt';
import * as encoder from './encoder';
const Database = require('better-sqlite3');
const fs = require('fs');
const jsc = require('jsverify');
const uuid = require('uuid');
const uuidGenerator = jsc
.integer(97, 122)
.smap(x => String.fromCharCode(x), x => x.charCodeAt(x));
const uuidGenerator = jsc.integer(97, 122).smap(
x => String.fromCharCode(x),
x => x.charCodeAt(x)
);
const mockSyncServer = require('../tests/mockSyncServer');
@ -129,7 +126,10 @@ Object.keys(schema).forEach(table => {
generators.push(
makeGen({
table,
row: jsc.asciinestring.smap(x => 'sheet!' + x, x => x),
row: jsc.asciinestring.smap(
x => 'sheet!' + x,
x => x
),
field: 'expr',
value: jsc.constant(JSON.stringify('fooooo'))
})

Some files were not shown because too many files have changed in this diff Show more