Shared cleanup

src/back/ConfigFile.ts

@@ -1,5 +1,5 @@
 import { AppConfigData } from '@shared/config/interfaces';
-import { getDefaultConfigData, overwriteConfigData } from '@shared/config/util';
+import { getDefaultConfigData, overwriteConfigData } from '@back/config/util';
 import { deepCopy, readJsonFile, readJsonFileSync, stringifyJsonDataFile } from '@shared/Util';
 import * as fs from 'fs';
 

src/back/ExtConfigFile.ts

@@ -1,5 +1,5 @@
 import { AppExtConfigData } from '@shared/config/interfaces';
-import { overwriteExtConfigData } from '@shared/config/util';
+import { overwriteExtConfigData } from '@back/config/util';
 import { readJsonFile, readJsonFileSync, stringifyJsonDataFile } from '@shared/Util';
 import * as fs from 'fs';
 

src/back/extensions/ApiImplementation.ts

@@ -15,7 +15,7 @@ import { BrowsePageLayout } from '@shared/BrowsePageLayout';
 import { IExtensionManifest } from '@shared/extensions/interfaces';
 import { ProcessState } from '@shared/interfaces';
 import { ILogEntry, LogLevel } from '@shared/Log/interface';
-import { PreferencesFile } from '@shared/preferences/PreferencesFile';
+import { PreferencesFile } from '@back/preferences/PreferencesFile';
 import { overwritePreferenceData } from '@shared/preferences/util';
 import * as flashpoint from 'flashpoint-launcher';
 import { extractFull } from 'node-7z';

src/back/extensions/ExtensionService.ts

@@ -4,7 +4,7 @@ import { Disposable, dispose, newDisposable } from '@back/util/lifecycle';
 import { TernarySearchTree } from '@back/util/map';
 import { AppConfigData } from '@shared/config/interfaces';
 import { ILogEntry } from '@shared/Log/interface';
-import { Contributions, ExtensionContribution, IExtension } from '../../shared/extensions/interfaces';
+import { Contributions, ExtensionContribution, IExtension } from '@shared/extensions/interfaces';
 import { scanExtensions } from './ExtensionsScanner';
 import { getExtensionEntry, newExtLog } from './ExtensionUtils';
 import { ExtensionContext, ExtensionData, ExtensionModule } from './types';

src/back/extensions/ExtensionsScanner.ts

@@ -4,7 +4,7 @@ import { Coerce } from '@shared/utils/Coerce';
 import { IObjectParserProp, ObjectParser } from '@shared/utils/ObjectParser';
 import * as fs from 'fs';
 import * as path from 'path';
-import { Application, ButtonContext, ContextButton, Contributions, DevScript, ExtConfiguration, ExtConfigurationProp, ExtensionType, ExtTheme, IExtension, IExtensionManifest, ILogoSet } from '../../shared/extensions/interfaces';
+import { Application, ButtonContext, ContextButton, Contributions, DevScript, ExtConfiguration, ExtConfigurationProp, ExtensionType, ExtTheme, IExtension, IExtensionManifest, ILogoSet } from '@shared/extensions/interfaces';
 
 const { str, num } = Coerce;
 const fsPromises = fs.promises;

src/back/index.ts

@@ -22,7 +22,7 @@ import { ILogoSet, LogoSet } from '@shared/extensions/interfaces';
 import { IBackProcessInfo, RecursivePartial } from '@shared/interfaces';
 import { getDefaultLocalization, LangFileContent } from '@shared/lang';
 import { ILogEntry, LogLevel } from '@shared/Log/interface';
-import { PreferencesFile } from '@shared/preferences/PreferencesFile';
+import { PreferencesFile } from '@back/preferences/PreferencesFile';
 import { defaultPreferencesData } from '@shared/preferences/util';
 import { Theme } from '@shared/ThemeFile';
 import { createErrorProxy, deepCopy, removeFileExtension, stringifyArray } from '@shared/Util';

src/shared/preferences/PreferencesFile.ts → src/back/preferences/PreferencesFile.ts

@@ -1,9 +1,9 @@
 import { getTempFilename } from '@back/util/misc';
 import * as fs from 'fs';
 import * as path from 'path';
-import { deepCopy, readJsonFile, readJsonFileSync, stringifyJsonDataFile } from '../Util';
-import { AppPreferencesData } from './interfaces';
-import { defaultPreferencesData, overwritePreferenceData } from './util';
+import { deepCopy, readJsonFile, readJsonFileSync, stringifyJsonDataFile } from '@shared/Util';
+import { AppPreferencesData } from '@shared/preferences/interfaces';
+import { defaultPreferencesData, overwritePreferenceData } from '@shared/preferences/util';
 
 /** Static class with methods for saving, loading and parsing the Preferences file */
 export namespace PreferencesFile {

src/back/responses.ts

@@ -6,7 +6,7 @@ import { Tag } from '@database/entity/Tag';
 import { TagAlias } from '@database/entity/TagAlias';
 import { TagCategory } from '@database/entity/TagCategory';
 import { BackIn, BackInit, BackOut, DownloadDetails } from '@shared/back/types';
-import { overwriteConfigData } from '@shared/config/util';
+import { overwriteConfigData } from '@back/config/util';
 import { LOGOS, SCREENSHOTS } from '@shared/constants';
 import { convertGameToCurationMetaFile } from '@shared/curate/metaToMeta';
 import { getContentFolderByKey } from '@shared/curate/util';
@@ -15,7 +15,7 @@ import { FilterGameOpts } from '@shared/game/GameFilter';
 import { DeepPartial, GamePropSuggestions, ProcessAction, ProcessState } from '@shared/interfaces';
 import { LogLevel } from '@shared/Log/interface';
 import { MetaEditFile, MetaEditMeta } from '@shared/MetaEdit';
-import { PreferencesFile } from '@shared/preferences/PreferencesFile';
+import { PreferencesFile } from '@back/preferences/PreferencesFile';
 import { defaultPreferencesData, overwritePreferenceData } from '@shared/preferences/util';
 import { deepCopy, padEnd } from '@shared/Util';
 import { sanitizeFilename } from '@shared/utils/sanitizeFilename';

src/main/BrowserMode.ts

@@ -3,7 +3,7 @@ import { CONFIG_FILENAME, PREFERENCES_FILENAME } from '@back/constants';
 import * as remoteMain from '@electron/remote/main';
 import { AppConfigData } from '@shared/config/interfaces';
 import { AppPreferencesData } from '@shared/preferences/interfaces';
-import { PreferencesFile } from '@shared/preferences/PreferencesFile';
+import { PreferencesFile } from '@back/preferences/PreferencesFile';
 import { createErrorProxy } from '@shared/Util';
 import { app, BrowserWindow, session, shell } from 'electron';
 import * as fs from 'fs';

src/main/LogsWindow.ts

@@ -4,9 +4,9 @@ import * as remoteMain from '@electron/remote/main';
 import { SocketClient } from '@shared/back/SocketClient';
 import { BackOut } from '@shared/back/types';
 import { AppConfigData } from '@shared/config/interfaces';
-import { InitRendererChannel, InitRendererData } from '@shared/IPC';
+import { InitRendererChannel, InitRendererData } from '@main/IPC';
 import { AppPreferencesData } from '@shared/preferences/interfaces';
-import { PreferencesFile } from '@shared/preferences/PreferencesFile';
+import { PreferencesFile } from '@back/preferences/PreferencesFile';
 import { createErrorProxy } from '@shared/Util';
 import { randomBytes } from 'crypto';
 import { app, BrowserWindow, ipcMain, IpcMainEvent, session, shell } from 'electron';

src/main/Main.ts

@@ -4,7 +4,7 @@ import { BackIn, BackInitArgs, BackOut } from '@shared/back/types';
 import { AppConfigData } from '@shared/config/interfaces';
 import { APP_TITLE } from '@shared/constants';
 import { WindowIPC } from '@shared/interfaces';
-import { InitRendererChannel, InitRendererData } from '@shared/IPC';
+import { InitRendererChannel, InitRendererData } from '@main/IPC';
 import { AppPreferencesData } from '@shared/preferences/interfaces';
 import { createErrorProxy } from '@shared/Util';
 import { ChildProcess, fork } from 'child_process';

src/main/MainWindowPreload.ts

@@ -1,7 +1,7 @@
 import * as remote from '@electron/remote';
 import { SocketClient } from '@shared/back/SocketClient';
 import { BackIn, BackOut } from '@shared/back/types';
-import { InitRendererChannel, InitRendererData } from '@shared/IPC';
+import { InitRendererChannel, InitRendererData } from '@main/IPC';
 import { setTheme } from '@shared/Theme';
 import { createErrorProxy } from '@shared/Util';
 import * as electron from 'electron';

src/shared/Log/LogCommon.ts → src/renderer/Log/LogCommon.ts

@@ -1,5 +1,5 @@
-import { padStart } from '../Util';
-import { ILogEntry, LogLevel } from './interface';
+import { padStart } from '@shared/Util';
+import { ILogEntry, LogLevel } from '@shared/Log/interface';
 
 export const timeChars = 11; // "[HH:MM:SS] "
 const sourceChars = 19; // "Background Services" (sometimes used with +2 to add the length of ": ")

src/renderer/app.tsx

@@ -6,13 +6,13 @@ import { BackIn, BackInit, BackOut } from '@shared/back/types';
 import { APP_TITLE, VIEW_PAGE_SIZE } from '@shared/constants';
 import { IService, ProcessState, WindowIPC } from '@shared/interfaces';
 import { LangContainer } from '@shared/lang';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import { updatePreferencesData } from '@shared/preferences/util';
 import { setTheme } from '@shared/Theme';
-import { getUpgradeString } from '@shared/upgrade/util';
+import { getUpgradeString } from '@renderer/util/upgrade';
 import { canReadWrite, deepCopy, getFileServerURL, recursiveReplace, sizeToString } from '@shared/Util';
-import { arrayShallowStrictEquals } from '@shared/utils/compare';
-import { debounce } from '@shared/utils/debounce';
+import { arrayShallowStrictEquals } from '@renderer/util/compare';
+import { debounce } from '@renderer/util/debounce';
 import { formatString } from '@shared/utils/StringFormatter';
 import { clipboard, ipcRenderer, Menu, MenuItemConstructorOptions } from 'electron';
 import { AppUpdater } from 'electron-updater';

src/renderer/components/ConfigBoxSelect.tsx

@@ -1,4 +1,4 @@
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import * as React from 'react';
 import { ConfigBox, ConfigBoxProps } from './ConfigBox';
 

src/renderer/components/DropdownInputField.tsx

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import { checkIfAncestor } from '../Util';
 import { InputField, InputFieldProps } from './InputField';
 

src/renderer/components/Footer.tsx

@@ -2,7 +2,7 @@ import { WithMainStateProps } from '@renderer/containers/withMainState';
 import { MainActionType } from '@renderer/store/main/enums';
 import { parseBrowsePageLayout, stringifyBrowsePageLayout } from '@shared/BrowsePageLayout';
 import { LangContainer } from '@shared/lang';
-import { getLibraryItemTitle } from '@shared/library/util';
+import { getLibraryItemTitle } from '@renderer/util/library';
 import { updatePreferencesData } from '@shared/preferences/util';
 import * as React from 'react';
 import { RouteComponentProps } from 'react-router-dom';

src/renderer/components/GameDataBrowser.tsx

@@ -4,7 +4,7 @@ import { SourceData } from '@database/entity/SourceData';
 import { LangContext } from '@renderer/util/lang';
 import { BackIn } from '@shared/back/types';
 import { LangContainer } from '@shared/lang';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import * as React from 'react';
 import { FloatingContainer } from './FloatingContainer';
 import { GameDataInfo } from './GameDataInfo';

src/renderer/components/GameGrid.tsx

@@ -1,6 +1,6 @@
 import { BackOut, BackOutTemplate } from '@shared/back/types';
 import { LOGOS, VIEW_PAGE_SIZE } from '@shared/constants';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import * as React from 'react';
 import { ArrowKeyStepper, AutoSizer, ScrollIndices } from 'react-virtualized';
 import { Grid, GridCellProps, RenderedSection } from 'react-virtualized/dist/es/Grid';

src/renderer/components/GameList.tsx

@@ -1,6 +1,6 @@
 import { withPreferences, WithPreferencesProps } from '@renderer/containers/withPreferences';
 import { VIEW_PAGE_SIZE } from '@shared/constants';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import * as React from 'react';
 import { ArrowKeyStepper, AutoSizer, List, ListRowProps, ScrollIndices } from 'react-virtualized';
 import { UpdateView, ViewGameSet } from '../interfaces';

src/renderer/components/Header.tsx

@@ -1,7 +1,7 @@
 import { WithTagCategoriesProps } from '@renderer/containers/withTagCategories';
 import { BackIn, TagSuggestion } from '@shared/back/types';
 import { LangContainer } from '@shared/lang';
-import { getLibraryItemTitle } from '@shared/library/util';
+import { getLibraryItemTitle } from '@renderer/util/library';
 import { GameOrderBy, GameOrderReverse } from '@shared/order/interfaces';
 import * as React from 'react';
 import { Link, RouteComponentProps, useLocation } from 'react-router-dom';

src/renderer/components/LeftBrowseSidebar.tsx

@@ -1,6 +1,6 @@
 import { Playlist } from '@database/entity/Playlist';
 import { LangContainer } from '@shared/lang';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import * as React from 'react';
 import { WithPreferencesProps } from '../containers/withPreferences';
 import { gameIdDataType } from '../Util';

src/renderer/components/RightBrowseSidebar.tsx

@@ -7,7 +7,7 @@ import { WithConfirmDialogProps } from '@renderer/containers/withConfirmDialog';
 import { BackIn, BackOut, BackOutTemplate, TagSuggestion } from '@shared/back/types';
 import { LOGOS, SCREENSHOTS } from '@shared/constants';
 import { wrapSearchTerm } from '@shared/game/GameFilter';
-import { ModelUtils } from '@shared/game/util';
+import { ModelUtils } from '@renderer/util/game';
 import { GamePropSuggestions, PickType, ProcessAction } from '@shared/interfaces';
 import { LangContainer } from '@shared/lang';
 import { deepCopy, generateTagFilterGroup, sizeToString } from '@shared/Util';

src/renderer/components/ServiceBox.tsx

@@ -3,7 +3,7 @@ import { BackIn } from '@shared/back/types';
 import { IBackProcessInfo, IService, ProcessAction, ProcessState } from '@shared/interfaces';
 import { LangContainer } from '@shared/lang';
 import { ILogEntry } from '@shared/Log/interface';
-import { escapeHTML, formatTime, padLines, timeChars } from '@shared/Log/LogCommon';
+import { escapeHTML, formatTime, padLines, timeChars } from '@renderer/Log/LogCommon';
 import * as React from 'react';
 import { setInterval } from 'timers';
 import { LangContext } from '../util/lang';

src/renderer/components/TagInputField.tsx

@@ -1,7 +1,7 @@
 import { Tag } from '@database/entity/Tag';
 import { TagCategory } from '@database/entity/TagCategory';
 import { TagSuggestion } from '@shared/back/types';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import * as React from 'react';
 import { checkIfAncestor } from '../Util';
 import { InputField, InputFieldProps } from './InputField';

src/renderer/components/pages/AboutPage.tsx

@@ -1,5 +1,5 @@
 import { LangContainer } from '@shared/lang';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import { versionNumberToText } from '@shared/Util';
 import * as React from 'react';
 import { CreditsBlock, CreditsData, CreditsDataProfile, CreditsDataRole } from '../../credits/types';

src/renderer/components/pages/BrowsePage.tsx

@@ -8,7 +8,7 @@ import { BrowsePageLayout } from '@shared/BrowsePageLayout';
 import { ExtensionContribution } from '@shared/extensions/interfaces';
 import { GamePropSuggestions } from '@shared/interfaces';
 import { LangContainer } from '@shared/lang';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import { updatePreferencesData } from '@shared/preferences/util';
 import { formatString } from '@shared/utils/StringFormatter';
 import { uuid } from '@shared/utils/uuid';

src/renderer/components/pages/ConfigPage.tsx

@@ -5,7 +5,7 @@ import { BackIn } from '@shared/back/types';
 import { AppExtConfigData } from '@shared/config/interfaces';
 import { ExtConfigurationProp, ExtensionContribution, IExtensionDescription, ILogoSet } from '@shared/extensions/interfaces';
 import { autoCode, LangContainer, LangFile } from '@shared/lang';
-import { memoizeOne } from '@shared/memoize';
+import { memoizeOne } from '@renderer/util/memoize';
 import { updatePreferencesData, updatePreferencesDataAsync } from '@shared/preferences/util';
 import { ITheme } from '@shared/ThemeFile';
 import { deepCopy } from '@shared/Util';

src/renderer/components/pages/CuratePage.tsx

@@ -8,8 +8,8 @@ import { CurationIndex, EditCuration, EditCurationMeta } from '@shared/curate/ty
 import { getContentFolderByKey, getCurationFolder, indexContentFolder } from '@shared/curate/util';
 import { GamePropSuggestions } from '@shared/interfaces';
 import { LangContainer } from '@shared/lang';
-import { getLibraryItemTitle } from '@shared/library/util';
-import { memoizeOne } from '@shared/memoize';
+import { getLibraryItemTitle } from '@renderer/util/library';
+import { memoizeOne } from '@renderer/util/memoize';
 import { updatePreferencesData } from '@shared/preferences/util';
 import * as fs from 'fs-extra';
 import * as path from 'path';

src/renderer/components/pages/DeveloperPage.tsx

@@ -9,7 +9,7 @@ import { LOGOS, SCREENSHOTS } from '@shared/constants';
 import { DevScript, ExtensionContribution } from '@shared/extensions/interfaces';
 import { ExecMapping, IService } from '@shared/interfaces';
 import { LangContainer } from '@shared/lang';
-import { Legacy_PlatformFileIterator } from '@shared/legacy/GameManager';
+import { Legacy_PlatformFileIterator } from '@renderer/legacy/GameManager';
 import { stringifyMetaValue } from '@shared/MetaEdit';
 import * as fs from 'fs-extra';
 import * as path from 'path';

src/renderer/components/pages/HomePage.tsx

@@ -6,7 +6,7 @@ import { ARCADE, THEATRE } from '@shared/constants';
 import { wrapSearchTerm } from '@shared/game/GameFilter';
 import { LangContainer } from '@shared/lang';
 import { updatePreferencesData } from '@shared/preferences/util';
-import { getUpgradeString } from '@shared/upgrade/util';
+import { getUpgradeString } from '@renderer/util/upgrade';
 import { formatString } from '@shared/utils/StringFormatter';
 import { AppUpdater, UpdateInfo } from 'electron-updater';
 import * as path from 'path';

src/renderer/components/pages/LogsPage.tsx

@@ -3,8 +3,8 @@ import { BackIn, BackOut } from '@shared/back/types';
 import { ArgumentTypesOf } from '@shared/interfaces';
 import { LangContainer } from '@shared/lang';
 import { LogLevel } from '@shared/Log/interface';
-import { stringifyLogEntries } from '@shared/Log/LogCommon';
-import { memoizeOne } from '@shared/memoize';
+import { stringifyLogEntries } from '@renderer/Log/LogCommon';
+import { memoizeOne } from '@renderer/util/memoize';
 import { updatePreferencesData } from '@shared/preferences/util';
 import { shallowStrictEquals } from '@shared/Util';
 import { clipboard } from 'electron';

src/shared/legacy/GameManager.ts → src/renderer/legacy/GameManager.ts

@@ -3,7 +3,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { promisify } from 'util';
 import { Legacy_GameParser } from './GameParser';
-import { Legacy_GamePlatform, Legacy_IRawPlatformFile } from './interfaces';
+import { Legacy_GamePlatform, Legacy_IRawPlatformFile } from '@shared/legacy/interfaces';
 import { Legacy_errorCopy } from './misc';
 import { Legacy_LoadPlatformError } from './types';
 

src/shared/legacy/GameParser.ts → src/renderer/legacy/GameParser.ts

@@ -1,4 +1,4 @@
-import { Legacy_IAdditionalApplicationInfo, Legacy_IGameCollection, Legacy_IGameInfo, Legacy_IRawPlatformFile, Legacy_IRawGameInfo, Legacy_IRawAdditionalApplicationInfo } from './interfaces';
+import { Legacy_IAdditionalApplicationInfo, Legacy_IGameCollection, Legacy_IGameInfo, Legacy_IRawPlatformFile, Legacy_IRawGameInfo, Legacy_IRawAdditionalApplicationInfo } from '@shared/legacy/interfaces';
 
 export class Legacy_GameParser {
   public static parse(data: Legacy_IRawPlatformFile, filename: string): Legacy_IGameCollection {

src/shared/utils/debounce.ts → src/renderer/util/debounce.ts

@@ -1,4 +1,4 @@
-import { AnyFunction, ArgumentTypesOf } from '../interfaces';
+import { AnyFunction, ArgumentTypesOf } from '@shared/interfaces';
 
 /** A callable object that has the same argument types as T (and void as the return type). */
 interface CallableCopy<T extends AnyFunction> extends Function {

src/shared/game/util.ts → src/renderer/util/game.ts

@@ -1,5 +1,5 @@
-import { AdditionalApp } from '../../database/entity/AdditionalApp';
-import { Game } from '../../database/entity/Game';
+import { AdditionalApp } from '@database/entity/AdditionalApp';
+import { Game } from '@database/entity/Game';
 
 export namespace ModelUtils {
   export function createGame(): Game {

src/shared/library/util.ts → src/renderer/util/library.ts

@@ -1,4 +1,4 @@
-import { LangContainer } from '../lang';
+import { LangContainer } from '@shared/lang';
 
 /**
  * Get the title of a library item from a language sub-container (or return the item's route if none was found).

src/shared/memoize.ts → src/renderer/util/memoize.ts

@@ -1,5 +1,5 @@
-import { AnyFunction, ArgumentTypesOf, ReturnTypeOf } from './interfaces';
-import { shallowStrictEquals } from './Util';
+import { AnyFunction, ArgumentTypesOf, ReturnTypeOf } from '@shared/interfaces';
+import { shallowStrictEquals } from '@shared/Util';
 
 /** Callable object, A is the arguments, R is the return value */
 interface Callable<A extends any[], R> extends Function {