[AI] Remove usage of 'web' file types

packages/component-library/vitest.web.config.ts

@@ -5,7 +5,6 @@ import { defineConfig } from 'vitest/config';
 
 const resolveExtensions = [
   '.testing.ts',
-  '.web.ts',
   '.mjs',
   '.js',
   '.mts',

packages/desktop-client/vite.config.mts

@@ -82,10 +82,6 @@ export default defineConfig(async ({ mode }) => {
   }
 
   let resolveExtensions = [
-    '.web.js',
-    '.web.jsx',
-    '.web.ts',
-    '.web.tsx',
     '.mjs',
     '.js',
     '.mts',

packages/loot-core/package.json

@@ -40,10 +40,10 @@
     "./platform/exceptions": "./src/platform/exceptions/index.ts",
     "./platform/server/asyncStorage": "./src/platform/server/asyncStorage/index.ts",
     "./platform/server/connection": "./src/platform/server/connection/index.ts",
-    "./platform/server/fetch": "./src/platform/server/fetch/index.web.ts",
-    "./platform/server/fs": "./src/platform/server/fs/index.web.ts",
-    "./platform/server/log": "./src/platform/server/log/index.web.ts",
-    "./platform/server/sqlite": "./src/platform/server/sqlite/index.web.ts",
+    "./platform/server/fetch": "./src/platform/server/fetch/index.ts",
+    "./platform/server/fs": "./src/platform/server/fs/index.ts",
+    "./platform/server/log": "./src/platform/server/log/index.ts",
+    "./platform/server/sqlite": "./src/platform/server/sqlite/index.ts",
     "./server/budget/types/*": "./src/server/budget/types/*.d.ts",
     "./server/*": "./src/server/*.ts",
     "./shared/*": "./src/shared/*.ts",

packages/loot-core/src/platform/server/asyncStorage/index.api.ts

@@ -0,0 +1,2 @@
+// oxlint-disable-next-line no-restricted-imports
+export * from './index.electron';

packages/loot-core/src/platform/server/fetch/index.electron.ts

@@ -1,9 +1,8 @@
 import { logger } from '../log';
 
-export const fetch = async (
-  input: RequestInfo | URL,
-  options?: RequestInit,
-) => {
+import type * as T from './index';
+
+export const fetch: typeof T.fetch = async (input, options) => {
   try {
     return await globalThis.fetch(input, {
       ...options,

packages/loot-core/src/platform/server/fs/index.api.ts

@@ -0,0 +1,2 @@
+// oxlint-disable-next-line no-restricted-imports
+export * from './index.electron';

packages/loot-core/src/platform/server/fs/index.electron.ts

@@ -6,7 +6,7 @@ import promiseRetry from 'promise-retry';
 
 import { logger } from '../log';
 
-import type * as T from '.';
+import type * as T from './index';
 
 export { getDocumentDir, getBudgetDir, _setDocumentDir } from './shared';
 
@@ -23,28 +23,37 @@ switch (path.basename(__filename)) {
     break;
 }
 
-export const init = async () => {
+export const init: typeof T.init = async () => {
   // Nothing to do
 };
 
-export const getDataDir = () => {
+export const getDataDir: typeof T.getDataDir = () => {
   if (!process.env.ACTUAL_DATA_DIR) {
     throw new Error('ACTUAL_DATA_DIR env variable is required');
   }
   return process.env.ACTUAL_DATA_DIR;
 };
 
-export const bundledDatabasePath = path.join(rootPath, 'default-db.sqlite');
+export const bundledDatabasePath: typeof T.bundledDatabasePath = path.join(
+  rootPath,
+  'default-db.sqlite',
+);
 
-export const migrationsPath = path.join(rootPath, 'migrations');
+export const migrationsPath: typeof T.migrationsPath = path.join(
+  rootPath,
+  'migrations',
+);
 
-export const demoBudgetPath = path.join(rootPath, 'demo-budget');
+export const demoBudgetPath: typeof T.demoBudgetPath = path.join(
+  rootPath,
+  'demo-budget',
+);
 
-export const join = path.join;
+export const join: typeof T.join = path.join;
 
-export const basename = filepath => path.basename(filepath);
+export const basename: typeof T.basename = filepath => path.basename(filepath);
 
-export const listDir: T.ListDir = filepath =>
+export const listDir: typeof T.listDir = filepath =>
   new Promise((resolve, reject) => {
     fs.readdir(filepath, (err, files) => {
       if (err) {
@@ -55,14 +64,14 @@ export const listDir: T.ListDir = filepath =>
     });
   });
 
-export const exists = filepath =>
+export const exists: typeof T.exists = filepath =>
   new Promise(resolve => {
     fs.access(filepath, fs.constants.F_OK, err => {
       return resolve(!err);
     });
   });
 
-export const mkdir = filepath =>
+export const mkdir: typeof T.mkdir = filepath =>
   new Promise((resolve, reject) => {
     fs.mkdir(filepath, err => {
       if (err) {
@@ -73,7 +82,7 @@ export const mkdir = filepath =>
     });
   });
 
-export const size = filepath =>
+export const size: typeof T.size = filepath =>
   new Promise((resolve, reject) => {
     fs.stat(filepath, (err, stats) => {
       if (err) {
@@ -84,7 +93,7 @@ export const size = filepath =>
     });
   });
 
-export const copyFile: T.CopyFile = (frompath, topath) => {
+export const copyFile: typeof T.copyFile = (frompath, topath) => {
   return new Promise<boolean>((resolve, reject) => {
     const readStream = fs.createReadStream(frompath);
     const writeStream = fs.createWriteStream(topath);
@@ -97,7 +106,7 @@ export const copyFile: T.CopyFile = (frompath, topath) => {
   });
 };
 
-export const readFile: T.ReadFile = (
+export const readFile: typeof T.readFile = (
   filepath: string,
   encoding: 'utf8' | 'binary' | null = 'utf8',
 ) => {
@@ -119,12 +128,11 @@ export const readFile: T.ReadFile = (
   });
 };
 
-export const writeFile: T.WriteFile = async (filepath, contents) => {
+export const writeFile: typeof T.writeFile = async (filepath, contents) => {
   try {
     await promiseRetry(
       (retry, attempt) => {
         return new Promise((resolve, reject) => {
-          // @ts-expect-error contents type needs refining
           fs.writeFile(filepath, contents, 'utf8', err => {
             if (err) {
               logger.error(
@@ -157,38 +165,39 @@ export const writeFile: T.WriteFile = async (filepath, contents) => {
   }
 };
 
-export const removeFile = filepath => {
+export const removeFile: typeof T.removeFile = filepath => {
   return new Promise(function (resolve, reject) {
     fs.unlink(filepath, err => {
       return err ? reject(err) : resolve(undefined);
     });
   });
 };
 
-export const removeDir = dirpath => {
+export const removeDir: typeof T.removeDir = dirpath => {
   return new Promise(function (resolve, reject) {
     fs.rmdir(dirpath, err => {
       return err ? reject(err) : resolve(undefined);
     });
   });
 };
 
-export const removeDirRecursively = async dirpath => {
-  if (await exists(dirpath)) {
-    for (const file of await listDir(dirpath)) {
-      const fullpath = join(dirpath, file);
-      if (fs.statSync(fullpath).isDirectory()) {
-        await removeDirRecursively(fullpath);
-      } else {
-        await removeFile(fullpath);
+export const removeDirRecursively: typeof T.removeDirRecursively =
+  async dirpath => {
+    if (await exists(dirpath)) {
+      for (const file of await listDir(dirpath)) {
+        const fullpath = join(dirpath, file);
+        if (fs.statSync(fullpath).isDirectory()) {
+          await removeDirRecursively(fullpath);
+        } else {
+          await removeFile(fullpath);
+        }
       }
-    }
 
-    await removeDir(dirpath);
-  }
-};
+      await removeDir(dirpath);
+    }
+  };
 
-export const getModifiedTime = filepath => {
+export const getModifiedTime: typeof T.getModifiedTime = filepath => {
   return new Promise(function (resolve, reject) {
     fs.stat(filepath, (err, stats) => {
       if (err) {