Skip to content

A local-first personal finance app

:recycle: (loot-core) unify some electron/web/api logic (#4610)

Matiss Janis Aboltins864aaacd1165
diff --git a/packages/loot-core/src/mocks/setup.ts b/packages/loot-core/src/mocks/setup.ts
index 64ea562bce..9068f4b72f 100644
--- a/packages/loot-core/src/mocks/setup.ts
+++ b/packages/loot-core/src/mocks/setup.ts
@@ -15,6 +15,7 @@ import * as rules from '../server/transactions/transaction-rules';
import { updateVersion } from '../server/update';
import { resetTracer, tracer } from '../shared/test-helpers';
+jest.mock('../platform/exceptions');
jest.mock('../server/post');
// By default, syncing is disabled
diff --git a/packages/loot-core/src/platform/client/undo/index.d.ts b/packages/loot-core/src/platform/client/undo/index.d.ts
deleted file mode 100644
index 63f1043690..0000000000
--- a/packages/loot-core/src/platform/client/undo/index.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Modal } from '../../../client/modals/modalsSlice';
-import { UndoState as ServerUndoState } from '../../../server/undo';
-
-export type UndoState = {
- url: string | null;
- openModal: Modal | null;
- selectedItems: {
- name: string;
- items: Set<string>;
- } | null;
- undoEvent: ServerUndoState | null;
-};
-
-export function setUndoState<K extends keyof Omit<UndoState, 'id'>>(
- name: K,
- value: UndoState[K],
-): void;
-export type SetUndoState = typeof setUndoState;
-
-export function getUndoState<K extends keyof UndoState>(name: K): UndoState[K];
-export type GetUndoState = typeof getUndoState;
-
-export function getTaggedState(id: string): UndoState | undefined;
-export type GetTaggedState = typeof getTaggedState;
-
-export function snapshot(): string;
-export type Snapshot = typeof snapshot;
-
-export function gc(id: string): void;
-export type Gc = typeof gc;
diff --git a/packages/loot-core/src/platform/client/undo/index.web.ts b/packages/loot-core/src/platform/client/undo/index.ts
similarity index 55%
rename from packages/loot-core/src/platform/client/undo/index.web.ts
rename to packages/loot-core/src/platform/client/undo/index.ts
index 39dde9ac0c..7d58c60012 100644
--- a/packages/loot-core/src/platform/client/undo/index.web.ts
+++ b/packages/loot-core/src/platform/client/undo/index.ts
@@ -1,8 +1,19 @@
import { v4 as uuidv4 } from 'uuid';
-import type * as T from '.';
+import { Modal } from '../../../client/modals/modalsSlice';
+import { UndoState as ServerUndoState } from '../../../server/undo';
+
+type UndoState = {
+ url: string | null;
+ openModal: Modal | null;
+ selectedItems: {
+ name: string;
+ items: Set<string>;
+ } | null;
+ undoEvent: ServerUndoState | null;
+};
-type UndoStateWithId = T.UndoState & {
+type UndoStateWithId = UndoState & {
id?: ReturnType<typeof uuidv4>;
};
@@ -18,26 +29,29 @@ const currentUndoState: UndoStateWithId = {
undoEvent: null,
};
-export const setUndoState: T.SetUndoState = function (name, value) {
+export const setUndoState = <K extends keyof Omit<UndoState, 'id'>>(
+ name: K,
+ value: UndoState[K],
+) => {
currentUndoState[name] = value;
currentUndoState.id = uuidv4();
};
-export const getUndoState: T.GetUndoState = function (name) {
+export const getUndoState = <K extends keyof UndoState>(name: K) => {
return currentUndoState[name];
};
-export const getTaggedState: T.GetTaggedState = function (id) {
+export const getTaggedState = (id: string) => {
return UNDO_STATE_MRU.find(state => state.id === id);
};
-export const snapshot: T.Snapshot = function () {
+export const snapshot = () => {
const tagged = { ...currentUndoState, id: uuidv4() };
UNDO_STATE_MRU.unshift(tagged);
UNDO_STATE_MRU = UNDO_STATE_MRU.slice(0, HISTORY_SIZE);
return tagged.id;
};
-export const gc: T.Gc = function (id) {
+export const gc = (id: string) => {
UNDO_STATE_MRU = UNDO_STATE_MRU.filter(state => state.id !== id);
};
diff --git a/packages/loot-core/src/platform/exceptions/__mocks__/index.ts b/packages/loot-core/src/platform/exceptions/__mocks__/index.ts
new file mode 100644
index 0000000000..9c48ca4c04
--- /dev/null
+++ b/packages/loot-core/src/platform/exceptions/__mocks__/index.ts
@@ -0,0 +1,3 @@
+export const captureException = function () {};
+
+export const captureBreadcrumb = function () {};
diff --git a/packages/loot-core/src/platform/exceptions/index.browser.ts b/packages/loot-core/src/platform/exceptions/index.browser.ts
deleted file mode 100644
index 95adc82959..0000000000
--- a/packages/loot-core/src/platform/exceptions/index.browser.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type * as T from '.';
-
-export const captureException: T.CaptureException = function (exc) {
- console.log('[Exception]', exc);
-};
-
-export const captureBreadcrumb: T.CaptureBreadcrumb = function () {};
diff --git a/packages/loot-core/src/platform/exceptions/index.d.ts b/packages/loot-core/src/platform/exceptions/index.d.ts
deleted file mode 100644
index 11568b754b..0000000000
--- a/packages/loot-core/src/platform/exceptions/index.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export function captureException(exc: Error): void;
-export type CaptureException = typeof captureException;
-
-export function captureBreadcrumb(breadcrumb: unknown): void;
-export type CaptureBreadcrumb = typeof captureBreadcrumb;
diff --git a/packages/loot-core/src/platform/exceptions/index.electron.ts b/packages/loot-core/src/platform/exceptions/index.electron.ts
deleted file mode 100644
index caeb929172..0000000000
--- a/packages/loot-core/src/platform/exceptions/index.electron.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type * as T from '.';
-
-export const captureException: T.CaptureException = function (exc) {
- console.error('[Exception]', exc);
-};
-
-export const captureBreadcrumb: T.CaptureBreadcrumb = function () {};
diff --git a/packages/loot-core/src/platform/exceptions/index.testing.ts b/packages/loot-core/src/platform/exceptions/index.testing.ts
deleted file mode 100644
index 82e6c5422d..0000000000
--- a/packages/loot-core/src/platform/exceptions/index.testing.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import type * as T from '.';
-
-export const captureException: T.CaptureException = function () {};
-
-export const captureBreadcrumb: T.CaptureBreadcrumb = function () {};
diff --git a/packages/loot-core/src/platform/exceptions/index.ts b/packages/loot-core/src/platform/exceptions/index.ts
new file mode 100644
index 0000000000..c4cfd614c4
--- /dev/null
+++ b/packages/loot-core/src/platform/exceptions/index.ts
@@ -0,0 +1,6 @@
+export const captureException = function (exc: Error) {
+ console.error('[Exception]', exc);
+};
+
+// eslint-disable-next-line
+export const captureBreadcrumb = function (crumb: unknown) {};
diff --git a/packages/loot-core/src/platform/exceptions/index.web.ts b/packages/loot-core/src/platform/exceptions/index.web.ts
deleted file mode 100644
index 95adc82959..0000000000
--- a/packages/loot-core/src/platform/exceptions/index.web.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import type * as T from '.';
-
-export const captureException: T.CaptureException = function (exc) {
- console.log('[Exception]', exc);
-};
-
-export const captureBreadcrumb: T.CaptureBreadcrumb = function () {};
diff --git a/packages/loot-core/src/platform/server/log/index.api.ts b/packages/loot-core/src/platform/server/log/index.api.ts
deleted file mode 100644
index 8ec90fb5e3..0000000000
--- a/packages/loot-core/src/platform/server/log/index.api.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { Logger } from '.';
-
-export const logger: Logger = {
- info: (...args) => {
- console.log(...args);
- },
- warn: (...args) => {
- console.warn(...args);
- },
-};
diff --git a/packages/loot-core/src/platform/server/log/index.d.ts b/packages/loot-core/src/platform/server/log/index.d.ts
deleted file mode 100644
index 9c62ae4e46..0000000000
--- a/packages/loot-core/src/platform/server/log/index.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export interface Logger {
- info(...args: unknown[]): void;
- warn(...args: unknown[]): void;
-}
-
-export const logger: Logger;
diff --git a/packages/loot-core/src/platform/server/log/index.electron.ts b/packages/loot-core/src/platform/server/log/index.electron.ts
deleted file mode 100644
index 8ec90fb5e3..0000000000
--- a/packages/loot-core/src/platform/server/log/index.electron.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { Logger } from '.';
-
-export const logger: Logger = {
- info: (...args) => {
- console.log(...args);
- },
- warn: (...args) => {
- console.warn(...args);
- },
-};
diff --git a/packages/loot-core/src/platform/server/log/index.ts b/packages/loot-core/src/platform/server/log/index.ts
new file mode 100644
index 0000000000..500194c110
--- /dev/null
+++ b/packages/loot-core/src/platform/server/log/index.ts
@@ -0,0 +1,8 @@
+export const logger = {
+ info: (...args: unknown[]) => {
+ console.log(...args);
+ },
+ warn: (...args: unknown[]) => {
+ console.warn(...args);
+ },
+};
diff --git a/packages/loot-core/src/platform/server/log/index.web.ts b/packages/loot-core/src/platform/server/log/index.web.ts
deleted file mode 100644
index 8ec90fb5e3..0000000000
--- a/packages/loot-core/src/platform/server/log/index.web.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { Logger } from '.';
-
-export const logger: Logger = {
- info: (...args) => {
- console.log(...args);
- },
- warn: (...args) => {
- console.warn(...args);
- },
-};
diff --git a/upcoming-release-notes/4610.md b/upcoming-release-notes/4610.md
new file mode 100644
index 0000000000..f4dcd239de
--- /dev/null
+++ b/upcoming-release-notes/4610.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Simplify some loot-core logic - unify electron/web/api versions.