Merge branch 'master' into main

actualbudget · Jan 12, 2024 · e9a2c45 · e9a2c45
2 parents 11cfbdf + 6ce794f
commit e9a2c45
Show file tree

Hide file tree

Showing 975 changed files with 12 additions and 305,147 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -24,7 +24,3 @@ packages/import-ynab5/**/node_modules/*
 packages/loot-core/**/node_modules/*
 packages/loot-core/**/lib-dist/*
 packages/loot-core/**/proto/*
-
-packages/node-libofx/libofx.*.js
-packages/node-libofx/libofx/
-packages/node-libofx/OpenSP-*/
diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.jsx b/packages/desktop-client/src/components/modals/ImportTransactions.jsx
@@ -743,20 +743,13 @@ export function ImportTransactions({ modalProps, options }) {
 
   const [clearOnImport, setClearOnImport] = useState(true);
 
-  const enableExperimentalOfxParser = useFeatureFlag('experimentalOfxParser');
-
   async function parse(filename, options) {
     setLoadingState('parsing');
 
     const filetype = getFileType(filename);
     setFilename(filename);
     setFileType(filetype);
 
-    options = {
-      ...options,
-      enableExperimentalOfxParser,
-    };
-
     const { errors, transactions } = await parseTransactions(filename, options);
     setLoadingState(null);
     setError(null);

diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx
@@ -94,10 +94,6 @@ export function ExperimentalFeatures() {
             <FeatureToggle flag="goalTemplatesEnabled">
               Goal templates
             </FeatureToggle>
-
-            <FeatureToggle flag="experimentalOfxParser">
-              Experimental OFX parser
-            </FeatureToggle>
           </View>
         ) : (
           <LinkButton

diff --git a/packages/desktop-client/src/hooks/useFeatureFlag.ts b/packages/desktop-client/src/hooks/useFeatureFlag.ts
@@ -8,7 +8,6 @@ const DEFAULT_FEATURE_FLAG_STATE: Record<FeatureFlag, boolean> = {
   reportBudget: false,
   goalTemplatesEnabled: false,
   customReports: false,
-  experimentalOfxParser: true,
 };
 
 export function useFeatureFlag(name: FeatureFlag): boolean {

diff --git a/packages/desktop-electron/package.json b/packages/desktop-electron/package.json
@@ -19,8 +19,7 @@
       "!**/*.js.map",
       "!node_modules/@jlongster/sql.js",
       "!node_modules/absurd-sql",
-      "!node_modules/better-sqlite3/{benchmark,src,bin,docs,deps,build/Release/obj,build/Release/sqlite3.a,build/Release/test_extension.node}",
-      "!node_modules/node-libofx/{OpenSP-1.5.2,libofx,libofx.web.js,libofx.web.wasm,emscripten.cpp,Makefile}"
+      "!node_modules/better-sqlite3/{benchmark,src,bin,docs,deps,build/Release/obj,build/Release/sqlite3.a,build/Release/test_extension.node}"
     ],
     "publish": {
       "provider": "github",

diff --git a/packages/loot-core/bin/build-browser b/packages/loot-core/bin/build-browser
@@ -37,7 +37,6 @@ if [ $NODE_ENV == 'development' ]; then
 fi
 
 cp ../../../node_modules/@jlongster/sql.js/dist/sql-wasm.wasm "$PUBLIC_DIR"/sql-wasm.wasm
-cp ../../node-libofx/libofx.web.wasm "$PUBLIC_DIR"/libofx.web.wasm
 
 yarn webpack --config ../webpack/webpack.browser.config.js \
   --target "webworker" \

diff --git a/packages/loot-core/package.json b/packages/loot-core/package.json
@@ -33,7 +33,6 @@
     "md5": "^2.3.0",
     "mitt": "^3.0.0",
     "node-fetch": "^2.6.9",
-    "node-libofx": "*",
     "path-browserify": "^1.0.1",
     "process": "^0.11.10",
     "reselect": "^4.1.8",

diff --git a/packages/loot-core/src/server/accounts/parse-file.test.ts b/packages/loot-core/src/server/accounts/parse-file.test.ts
@@ -37,9 +37,6 @@ async function importFileWithRealTime(
   global.restoreDateNow();
   const { errors, transactions: originalTransactions } = await parseFile(
     filepath,
-    {
-      enableExperimentalOfxParser: true,
-    },
   );
   global.restoreFakeDateNow();
 

diff --git a/packages/loot-core/src/server/accounts/parse-file.ts b/packages/loot-core/src/server/accounts/parse-file.ts
@@ -1,7 +1,6 @@
 import csv2json from 'csv-parse/lib/sync';
 
 import * as fs from '../../platform/server/fs';
-import { dayFromDate } from '../../shared/months';
 import { looselyParseAmount } from '../../shared/util';
 
 import { ofx2json } from './ofx2json';
@@ -17,12 +16,11 @@ type ParseFileOptions = {
   hasHeaderRow?: boolean;
   delimiter?: string;
   fallbackMissingPayeeToMemo?: boolean;
-  enableExperimentalOfxParser?: boolean;
 };
 
 export async function parseFile(
   filepath: string,
-  options?: ParseFileOptions,
+  options: ParseFileOptions = {},
 ): Promise<ParseFileResult> {
   const errors = Array<ParseError>();
   const m = filepath.match(/\.[^.]*$/);
@@ -52,7 +50,7 @@ export async function parseFile(
 
 async function parseCSV(
   filepath: string,
-  options?: ParseFileOptions,
+  options: ParseFileOptions,
 ): Promise<ParseFileResult> {
   const errors = Array<ParseError>();
   const contents = await fs.readFile(filepath);
@@ -109,12 +107,8 @@ async function parseQIF(filepath: string): Promise<ParseFileResult> {
 
 async function parseOFX(
   filepath: string,
-  options?: ParseFileOptions,
+  options: ParseFileOptions,
 ): Promise<ParseFileResult> {
-  if (!options?.enableExperimentalOfxParser) {
-    return parseOFXNodeLibOFX(filepath, options);
-  }
-
   const errors = Array<ParseError>();
   const contents = await fs.readFile(filepath);
 
@@ -147,43 +141,3 @@ async function parseOFX(
     }),
   };
 }
-
-async function parseOFXNodeLibOFX(
-  filepath: string,
-  options: ParseFileOptions,
-): Promise<ParseFileResult> {
-  const { getOFXTransactions, initModule } = await import(
-    /* webpackChunkName: 'xfo' */ 'node-libofx'
-  );
-  await initModule();
-
-  const errors = Array<ParseError>();
-  const contents = await fs.readFile(filepath, 'binary');
-
-  let data;
-  try {
-    data = getOFXTransactions(contents);
-  } catch (err) {
-    errors.push({
-      message: 'Failed importing file',
-      internal: err.stack,
-    });
-    return { errors };
-  }
-
-  // Banks don't always implement the OFX standard properly
-  // If no payee is available try and fallback to memo
-  const useMemoFallback = options.fallbackMissingPayeeToMemo;
-
-  return {
-    errors,
-    transactions: data.map(trans => ({
-      amount: trans.amount,
-      imported_id: trans.fi_id,
-      date: trans.date ? dayFromDate(new Date(trans.date * 1000)) : null,
-      payee_name: trans.name || (useMemoFallback ? trans.memo : null),
-      imported_payee: trans.name || (useMemoFallback ? trans.memo : null),
-      notes: !!trans.name || !useMemoFallback ? trans.memo || null : null, //memo used for payee
-    })),
-  };
-}
diff --git a/packages/loot-core/src/types/prefs.d.ts b/packages/loot-core/src/types/prefs.d.ts
@@ -5,8 +5,7 @@ export type FeatureFlag =
   | 'sankeyReport'
   | 'reportBudget'
   | 'goalTemplatesEnabled'
-  | 'customReports'
-  | 'experimentalOfxParser';
+  | 'customReports';
 
 export type LocalPrefs = Partial<
   {

diff --git a/packages/loot-core/webpack/webpack.desktop.config.js b/packages/loot-core/webpack/webpack.desktop.config.js
@@ -28,7 +28,7 @@ module.exports = {
       'pegjs',
     ],
   },
-  externals: ['better-sqlite3', 'electron-log', 'node-fetch', 'node-libofx'],
+  externals: ['better-sqlite3', 'electron-log', 'node-fetch'],
   plugins: [
     new webpack.IgnorePlugin({
       resourceRegExp: /original-fs/,

diff --git a/packages/node-libofx/.gitignore b/packages/node-libofx/.gitignore
diff --git a/packages/node-libofx/Makefile b/packages/node-libofx/Makefile
diff --git a/packages/node-libofx/OpenSP-1.5.2/.cvsignore b/packages/node-libofx/OpenSP-1.5.2/.cvsignore