Moved shared bridge types outside main/renderer

src/main/ConsoleAPI.ts

@@ -1,5 +1,5 @@
 import { QuickJSContext, QuickJSHandle, Scope } from 'quickjs-emscripten';
-import { ConsoleAPI } from 'renderer/ConsoleAPI';
+import type { ConsoleAPI } from 'bridge/ConsoleAPI';
 
 export function getConsoleAPI(
   vm: QuickJSContext,

src/main/InstallationRuntime.ts

@@ -1,4 +1,4 @@
-import { ConsoleAPI } from 'renderer/ConsoleAPI';
+import type { ConsoleAPI } from 'bridge/ConsoleAPI';
 import { FileManager } from './FileManager';
 
 export class InstallationRuntime {

src/main/ModAPI.ts

@@ -1,6 +1,6 @@
-import { JSONData } from 'renderer/JSON';
-import { ModAPI } from 'renderer/ModAPI';
-import { TSVData } from 'renderer/TSV';
+import type { JSONData } from 'bridge/JSON';
+import type { ModAPI } from 'bridge/ModAPI';
+import type { TSVData } from 'bridge/TSV';
 import { InstallationRuntime } from './InstallationRuntime';
 import { QuickJSContext, QuickJSHandle, Scope } from 'quickjs-emscripten';
 

src/main/api.ts

@@ -16,10 +16,10 @@ import ref from 'ref-napi';
 import { execFile, execFileSync } from 'child_process';
 import json5 from 'json5';
 import ts from 'typescript';
-import { ConsoleAPI } from 'renderer/ConsoleAPI';
-import { ModConfigValue } from 'renderer/ModConfigValue';
-import { TSVDataRow } from 'renderer/TSV';
-import { JSONData } from 'renderer/JSON';
+import type { ConsoleAPI } from 'bridge/ConsoleAPI';
+import type { ModConfigValue } from 'bridge/ModConfigValue';
+import type { TSVDataRow } from 'bridge/TSV';
+import type { JSONData } from 'bridge/JSON';
 import packageManifest from '../../release/app/package.json';
 import { getModAPI } from './ModAPI';
 import { InstallationRuntime } from './InstallationRuntime';

src/mods/types.d.ts

@@ -1,6 +1,6 @@
-import { ConsoleAPI } from '../renderer/ConsoleAPI';
-import { ModAPI } from '../renderer/ModAPI';
-import { ModConfigValue } from '../renderer/ModConfigValue';
+import { ConsoleAPI } from '../bridge/ConsoleAPI';
+import { ModAPI } from '../bridge/ModAPI';
+import { ModConfigValue } from '../bridge/ModConfigValue';
 
 declare global {
   /**

src/renderer/BindingsParser.tsx

@@ -1,5 +1,5 @@
-import { Binding } from './Bindings';
-import { ModConfigSingleValue, ModConfigValue } from './ModConfigValue';
+import { Binding } from 'bridge/Bindings';
+import { ModConfigSingleValue, ModConfigValue } from 'bridge/ModConfigValue';
 
 export function parseBinding<T extends ModConfigSingleValue>(
   value: Binding<T>,

src/renderer/ModSettings.tsx

@@ -1,6 +1,6 @@
 import { Close } from '@mui/icons-material';
 import { Box, Divider, FormGroup, IconButton, Typography } from '@mui/material';
-import { ModConfigFieldOrSection, ModConfigSection } from './ModConfig';
+import { ModConfigFieldOrSection, ModConfigSection } from 'bridge/ModConfig';
 import ModSettingsSection from './ModSettingsSection';
 
 type Props = {

src/renderer/ModSettingsCheckboxField.tsx

@@ -1,7 +1,7 @@
 import { FormControlLabel, Switch } from '@mui/material';
 import { useCallback } from 'react';
-import { ModConfigFieldCheckbox } from './ModConfig';
-import { ModConfigSingleValue } from './ModConfigValue';
+import { ModConfigFieldCheckbox } from 'bridge/ModConfig';
+import { ModConfigSingleValue } from 'bridge/ModConfigValue';
 
 type Props = {
   field: ModConfigFieldCheckbox;

src/renderer/ModSettingsColorSelectorField.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useMemo, useState, useTransition } from 'react';
 import { MuiColorInput, MuiColorInputColors } from 'mui-color-input';
-import { ModConfigFieldColor } from './ModConfig';
-import { ModConfigSingleValue } from './ModConfigValue';
+import { ModConfigFieldColor } from 'bridge/ModConfig';
+import { ModConfigSingleValue } from 'bridge/ModConfigValue';
 
 function debounce<TArgs extends unknown[]>(
   fn: (...args: TArgs) => void,

src/renderer/ModSettingsField.tsx

@@ -5,8 +5,8 @@ import ModSettingsNumberField from './ModSettingsNumberField';
 import ModSettingsTextField from './ModSettingsTextField';
 import ModSettingsSelectField from './ModSettingsSelectField';
 import ModSettingsCheckboxField from './ModSettingsCheckboxField';
-import { ModConfigField } from './ModConfig';
-import { ModConfigSingleValue } from './ModConfigValue';
+import { ModConfigField } from 'bridge/ModConfig';
+import { ModConfigSingleValue } from 'bridge/ModConfigValue';
 import { useSetModConfig } from './ModsContext';
 import { parseBinding } from './BindingsParser';
 import ModSettingsColorSelectorField from './ModSettingsColorSelectorField';

src/renderer/ModSettingsNumberField.tsx

@@ -1,6 +1,6 @@
 import { TextField } from '@mui/material';
 import { ChangeEvent, useCallback, useEffect, useState } from 'react';
-import { ModConfigFieldNumber } from './ModConfig';
+import { ModConfigFieldNumber } from 'bridge/ModConfig';
 
 function useIsFocused(): [
   isFocused: boolean,

src/renderer/ModSettingsSection.tsx

@@ -7,7 +7,7 @@ import {
   styled,
 } from '@mui/material';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import { ModConfigFieldOrSection, ModConfigSection } from './ModConfig';
+import { ModConfigFieldOrSection, ModConfigSection } from 'bridge/ModConfig';
 import ModSettingsField from './ModSettingsField';
 
 const StyledAccordion = styled(Accordion)(({ theme }) => ({

src/renderer/ModSettingsSelectField.tsx

@@ -1,7 +1,7 @@
 import { Box, MenuItem, Select, SelectChangeEvent } from '@mui/material';
 import { useCallback } from 'react';
-import { ModConfigFieldSelect } from './ModConfig';
-import { ModConfigSingleValue } from './ModConfigValue';
+import { ModConfigFieldSelect } from 'bridge/ModConfig';
+import { ModConfigSingleValue } from 'bridge/ModConfigValue';
 
 type Props = {
   field: ModConfigFieldSelect;

src/renderer/ModSettingsTextField.tsx

@@ -1,7 +1,7 @@
 import { TextField } from '@mui/material';
 import { ChangeEvent, useCallback } from 'react';
-import { ModConfigFieldText } from './ModConfig';
-import { ModConfigSingleValue } from './ModConfigValue';
+import { ModConfigFieldText } from 'bridge/ModConfig';
+import { ModConfigSingleValue } from 'bridge/ModConfigValue';
 
 type Props = {
   field: ModConfigFieldText;

src/renderer/ModsContext.tsx

@@ -8,7 +8,7 @@ import React, {
 import useSavedState from './useSavedState';
 import { useLogger } from './Logs';
 import useToast from './useToast';
-import { ModConfigSingleValue, ModConfigValue } from './ModConfigValue';
+import { ModConfigSingleValue, ModConfigValue } from 'bridge/ModConfigValue';
 
 const BridgeAPI = window.electron.BridgeAPI;
 

src/renderer/Preferences.tsx

@@ -1,6 +1,6 @@
 import React, { useContext, useMemo } from 'react';
 import useSavedState from './useSavedState';
-import { IPreferences } from './PreferenceTypes';
+import { IPreferences } from 'bridge/PreferenceTypes';
 
 const BridgeAPI = window.electron.BridgeAPI;
 

typedoc.json

@@ -2,13 +2,13 @@
   "name": "D2RMM",
   "readme": "DOCS.md",
   "entryPoints": [
-    "src/renderer/Bindings.d.ts",
-    "src/renderer/ConsoleAPI.d.ts",
-    "src/renderer/JSON.d.ts",
-    "src/renderer/ModAPI.d.ts",
-    "src/renderer/ModConfig.d.ts",
-    "src/renderer/ModConfigValue.d.ts",
-    "src/renderer/TSV.d.ts"
+    "src/bridge/Bindings.d.ts",
+    "src/bridge/ConsoleAPI.d.ts",
+    "src/bridge/JSON.d.ts",
+    "src/bridge/ModAPI.d.ts",
+    "src/bridge/ModConfig.d.ts",
+    "src/bridge/ModConfigValue.d.ts",
+    "src/bridge/TSV.d.ts"
   ],
   "out": "docs",
   "githubPages": false,