refactor: Moved to absolute imports

fix: Fixed ConfigFile not parsing themeFolderPath
FlashpointProject · Jan 12, 2020 · 519eb67 · 519eb67
1 parent f1cd298
commit 519eb67
Show file tree

Hide file tree

Showing 86 changed files with 403 additions and 931 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,8 +20,9 @@ package-lock.json
 /preferences.json
 /.installed
 /.version
-/upgrade.json
-/upgrade_launcher.json
 /secret.txt
+
+# Jest related files
 /.coveralls.yml
-/coverage
+/coverage
+/tests/result
diff --git a/gulpfile.js b/gulpfile.js
@@ -24,12 +24,8 @@ const config = {
 
 /* ------ Watch ------ */
 
-gulp.task('watch-main', (done) => {
-  execute(`npx tsc --project "${config.main.src}" --pretty --watch`, done);
-});
-
 gulp.task('watch-back', (done) => {
-  execute(`npx tsc --project "${config.back.src}" --pretty --watch`, done);
+  execute('npx ttsc --project tsconfig.backend.json --pretty --watch', done);
 });
 
 gulp.task('watch-renderer', (done) => {
@@ -44,12 +40,8 @@ gulp.task('watch-static', () => {
 
 /* ------ Build ------ */
 
-gulp.task('build-main', (done) => {
-  execute(`npx tsc --project "${config.main.src}" --pretty`, done);
-});
-
 gulp.task('build-back', (done) => {
-  execute(`npx tsc --project "${config.back.src}" --pretty`, done);
+  execute('npx ttsc --project tsconfig.backend.json --pretty', done);
 });
 
 gulp.task('build-renderer', (done) => {
@@ -112,9 +104,9 @@ gulp.task('pack', (done) => {
 
 /* ------ Meta Tasks ------*/
 
-gulp.task('watch', gulp.parallel('watch-main', 'watch-back', 'watch-renderer', 'watch-static', 'copy-static'));
+gulp.task('watch', gulp.parallel('watch-back', 'watch-renderer', 'watch-static', 'copy-static'));
 
-gulp.task('build', gulp.parallel('build-main', 'build-back', 'build-renderer', 'copy-static', 'config-install', 'config-version'));
+gulp.task('build', gulp.parallel('build-back', 'build-renderer', 'copy-static', 'config-install', 'config-version'));
 
 /* ------ Misc ------*/
 

diff --git a/jest.config.js b/jest.config.js
@@ -1,4 +1,11 @@
 module.exports = {
   preset: 'ts-jest',
-  testEnvironment: 'jsdom'
+  testEnvironment: 'jsdom',
+  moduleNameMapper: {
+    '^@shared(.*)$': '<rootDir>/src/shared/$1',
+    '^@main(.*)$': '<rootDir>/src/main/$1',
+    '^@renderer(.*)$': '<rootDir>/src/renderer/$1',
+    '^@back(.*)$': '<rootDir>/src/back/$1',
+    '^@tests(.*)$': '<rootDir>/tests/$1'
+  }
 };
diff --git a/package.json b/package.json
@@ -80,7 +80,10 @@
     "jest": "24.8.0",
     "ts-jest": "24.0.2",
     "ts-loader": "6.0.4",
+    "ts-transform-paths": "2.0.0",
+    "tsconfig-paths-webpack-plugin": "3.2.0",
     "tslint": "5.18.0",
+    "ttypescript": "1.5.10",
     "typescript": "3.5.3",
     "webpack": "4.39.1",
     "webpack-cli": "3.3.6"

diff --git a/src/back/ConfigFile.ts b/src/back/ConfigFile.ts
@@ -1,7 +1,7 @@
 import * as fs from 'fs';
-import { IAppConfigData } from '../shared/config/interfaces';
-import { deepCopy, readJsonFile, stringifyJsonDataFile } from '../shared/Util';
-import { getDefaultConfigData, overwriteConfigData } from '../shared/config/util';
+import { IAppConfigData } from '@shared/config/interfaces';
+import { deepCopy, readJsonFile, stringifyJsonDataFile } from '@shared/Util';
+import { getDefaultConfigData, overwriteConfigData } from '@shared/config/util';
 
 export namespace ConfigFile {
   /** Get the config file path (or throw and error if it is not set). */

diff --git a/src/back/Execs.ts b/src/back/Execs.ts
@@ -1,8 +1,8 @@
 import * as path from 'path';
-import { ExecMapping } from '../shared/interfaces';
-import { parseVarStr, readJsonFile } from '../shared/Util';
-import { Coerce } from '../shared/utils/Coerce';
-import { IObjectParserProp, ObjectParser } from '../shared/utils/ObjectParser';
+import { ExecMapping } from '@shared/interfaces';
+import { parseVarStr, readJsonFile } from '@shared/Util';
+import { Coerce } from '@shared/utils/Coerce';
+import { IObjectParserProp, ObjectParser } from '@shared/utils/ObjectParser';
 
 const { str } = Coerce;
 

diff --git a/src/back/GameLauncher.ts b/src/back/GameLauncher.ts
@@ -1,10 +1,10 @@
 import { ChildProcess, exec, ExecOptions } from 'child_process';
 import { EventEmitter } from 'events';
 import * as path from 'path';
-import { IAdditionalApplicationInfo, IGameInfo } from '../shared/game/interfaces';
-import { ExecMapping } from '../shared/interfaces';
-import { LangContainer } from '../shared/lang';
-import { fixSlashes, padStart, stringifyArray } from '../shared/Util';
+import { IAdditionalApplicationInfo, IGameInfo } from '@shared/game/interfaces';
+import { ExecMapping } from '@shared/interfaces';
+import { LangContainer } from '@shared/lang';
+import { fixSlashes, padStart, stringifyArray } from '@shared/Util';
 import { LogFunc, OpenDialogFunc, OpenExternalFunc } from './types';
 
 export type LaunchAddAppOpts = LaunchBaseOpts & {

diff --git a/src/back/ManagedChildProcess.ts b/src/back/ManagedChildProcess.ts
@@ -1,8 +1,8 @@
 import { ChildProcess, spawn } from 'child_process';
 import { EventEmitter } from 'events';
-import { IBackProcessInfo, ProcessState } from '../shared/interfaces';
-import { ILogPreEntry } from '../shared/Log/interface';
-import { Coerce } from '../shared/utils/Coerce';
+import { IBackProcessInfo, ProcessState } from '@shared/interfaces';
+import { ILogPreEntry } from '@shared/Log/interface';
+import { Coerce } from '@shared/utils/Coerce';
 
 const { str } = Coerce;
 

diff --git a/src/back/PlaylistFile.ts b/src/back/PlaylistFile.ts
@@ -1,9 +1,9 @@
 import * as fs from 'fs';
 import { promisify } from 'util';
-import { GamePlaylistContent, GamePlaylistEntry } from '../shared/interfaces';
-import { stringifyJsonDataFile } from '../shared/Util';
-import { Coerce } from '../shared/utils/Coerce';
-import { IObjectParserProp, ObjectParser } from '../shared/utils/ObjectParser';
+import { GamePlaylistContent, GamePlaylistEntry } from '@shared/interfaces';
+import { stringifyJsonDataFile } from '@shared/Util';
+import { Coerce } from '@shared/utils/Coerce';
+import { IObjectParserProp, ObjectParser } from '@shared/utils/ObjectParser';
 
 const writeFile = promisify(fs.writeFile);
 

diff --git a/src/back/ServicesFile.ts b/src/back/ServicesFile.ts
@@ -1,8 +1,8 @@
 import * as path from 'path';
-import { IBackProcessInfo } from '../shared/interfaces';
-import { parseVarStr, readJsonFile } from '../shared/Util';
-import { Coerce } from '../shared/utils/Coerce';
-import { IObjectParserProp, ObjectParser } from '../shared/utils/ObjectParser';
+import { IBackProcessInfo } from '@shared/interfaces';
+import { parseVarStr, readJsonFile } from '@shared/Util';
+import { Coerce } from '@shared/utils/Coerce';
+import { IObjectParserProp, ObjectParser } from '@shared/utils/ObjectParser';
 
 const { str } = Coerce;
 

diff --git a/src/back/game/GameManager.ts b/src/back/game/GameManager.ts
@@ -2,9 +2,9 @@ import * as fastXmlParser from 'fast-xml-parser';
 import * as fs from 'fs';
 import * as path from 'path';
 import { promisify } from 'util';
-import { GameParser } from '../../shared/game/GameParser';
-import { IAdditionalApplicationInfo, IGameCollection, IGameInfo, MetaUpdate } from '../../shared/game/interfaces';
-import { GamePlatform, IRawPlatformFile } from '../../shared/platform/interfaces';
+import { GameParser } from '@shared/game/GameParser';
+import { IAdditionalApplicationInfo, IGameCollection, IGameInfo, MetaUpdate } from '@shared/game/interfaces';
+import { GamePlatform, IRawPlatformFile } from '@shared/platform/interfaces';
 import { copyError } from '../util/misc';
 import { GameManagerState, LoadPlatformError } from './types';
 

diff --git a/src/back/game/types.ts b/src/back/game/types.ts
@@ -1,7 +1,7 @@
-import { OrderGamesOpts } from '../../shared/game/GameFilter';
-import { IGameInfo } from '../../shared/game/interfaces';
-import { GamePlaylist } from '../../shared/interfaces';
-import { GamePlatform } from '../../shared/platform/interfaces';
+import { OrderGamesOpts } from '@shared/game/GameFilter';
+import { IGameInfo } from '@shared/game/interfaces';
+import { GamePlaylist } from '@shared/interfaces';
+import { GamePlatform } from '@shared/platform/interfaces';
 import { EventQueue } from '../util/EventQueue';
 import { ErrorCopy } from '../util/misc';
 

diff --git a/src/back/importGame.ts b/src/back/importGame.ts
@@ -4,13 +4,13 @@ import { copy } from 'fs-extra';
 import * as path from 'path';
 import { promisify } from 'util';
 import * as YAML from 'yaml';
-import { htdocsPath, LOGOS, SCREENSHOTS } from '../shared/constants';
-import { convertEditToCurationMeta } from '../shared/curate/metaToMeta';
-import { CurationIndexImage, EditAddAppCuration, EditAddAppCurationMeta, EditCuration, EditCurationMeta } from '../shared/curate/types';
-import { getContentFolderByKey, getCurationFolder, indexContentFolder } from '../shared/curate/util';
-import { IAdditionalApplicationInfo, IGameInfo } from '../shared/game/interfaces';
-import { formatDate, sizeToString } from '../shared/Util';
-import { Coerce } from '../shared/utils/Coerce';
+import { htdocsPath, LOGOS, SCREENSHOTS } from '@shared/constants';
+import { convertEditToCurationMeta } from '@shared/curate/metaToMeta';
+import { CurationIndexImage, EditAddAppCuration, EditAddAppCurationMeta, EditCuration, EditCurationMeta } from '@shared/curate/types';
+import { getContentFolderByKey, getCurationFolder, indexContentFolder } from '@shared/curate/util';
+import { IAdditionalApplicationInfo, IGameInfo } from '@shared/game/interfaces';
+import { formatDate, sizeToString } from '@shared/Util';
+import { Coerce } from '@shared/utils/Coerce';
 import { GameManager } from './game/GameManager';
 import { GameManagerState } from './game/types';
 import { GameLauncher, LaunchAddAppOpts, LaunchGameOpts } from './GameLauncher';

diff --git a/src/back/index.ts b/src/back/index.ts
@@ -7,23 +7,23 @@ import * as http from 'http';
 import * as path from 'path';
 import * as util from 'util';
 import * as WebSocket from 'ws';
-import { AddLogData, BackIn, BackInit, BackInitArgs, BackOut, BrowseChangeData, BrowseViewIndexData, BrowseViewIndexResponseData, BrowseViewPageData, BrowseViewPageResponseData, DeleteGameData, DeleteImageData, DeletePlaylistData, DuplicateGameData, ExportGameData, GetAllGamesResponseData, GetExecData, GetGameData, GetGameResponseData, GetGamesTotalResponseData, GetMainInitDataResponse, GetPlaylistResponse, GetRendererInitDataResponse, GetSuggestionsResponseData, ImageChangeData, ImportCurationData, ImportCurationResponseData, InitEventData, LanguageChangeData, LanguageListChangeData, LaunchAddAppData, LaunchCurationAddAppData, LaunchCurationData, LaunchGameData, LocaleUpdateData, OpenDialogData, OpenDialogResponseData, OpenExternalData, OpenExternalResponseData, PlaylistRemoveData, PlaylistUpdateData, QuickSearchData, QuickSearchResponseData, RandomGamesData, RandomGamesResponseData, SaveGameData, SaveImageData, SavePlaylistData, ServiceActionData, SetLocaleData, ThemeChangeData, ThemeListChangeData, UpdateConfigData, ViewGame, WrappedRequest, WrappedResponse } from '../shared/back/types';
-import { overwriteConfigData } from '../shared/config/util';
-import { LOGOS, SCREENSHOTS } from '../shared/constants';
-import { findMostUsedApplicationPaths } from '../shared/curate/defaultValues';
-import { stringifyCurationFormat } from '../shared/curate/format/stringifier';
-import { convertToCurationMeta } from '../shared/curate/metaToMeta';
-import { FilterGameOpts, filterGames, orderGames, orderGamesInPlaylist } from '../shared/game/GameFilter';
-import { IAdditionalApplicationInfo, IGameInfo } from '../shared/game/interfaces';
-import { DeepPartial, GamePlaylist, IBackProcessInfo, IService, ProcessAction, RecursivePartial } from '../shared/interfaces';
-import { autoCode, getDefaultLocalization, LangContainer, LangFile, LangFileContent } from '../shared/lang';
-import { ILogEntry, ILogPreEntry } from '../shared/Log/interface';
-import { GameOrderBy, GameOrderReverse } from '../shared/order/interfaces';
-import { PreferencesFile } from '../shared/preferences/PreferencesFile';
-import { defaultPreferencesData, overwritePreferenceData } from '../shared/preferences/util';
-import { parseThemeMetaData, themeEntryFilename, ThemeMeta } from '../shared/ThemeFile';
-import { createErrorProxy, deepCopy, isErrorProxy, recursiveReplace, removeFileExtension, stringifyArray } from '../shared/Util';
-import { Coerce } from '../shared/utils/Coerce';
+import { AddLogData, BackIn, BackInit, BackInitArgs, BackOut, BrowseChangeData, BrowseViewIndexData, BrowseViewIndexResponseData, BrowseViewPageData, BrowseViewPageResponseData, DeleteGameData, DeleteImageData, DeletePlaylistData, DuplicateGameData, ExportGameData, GetAllGamesResponseData, GetExecData, GetGameData, GetGameResponseData, GetGamesTotalResponseData, GetMainInitDataResponse, GetPlaylistResponse, GetRendererInitDataResponse, GetSuggestionsResponseData, ImageChangeData, ImportCurationData, ImportCurationResponseData, InitEventData, LanguageChangeData, LanguageListChangeData, LaunchAddAppData, LaunchCurationAddAppData, LaunchCurationData, LaunchGameData, LocaleUpdateData, OpenDialogData, OpenDialogResponseData, OpenExternalData, OpenExternalResponseData, PlaylistRemoveData, PlaylistUpdateData, QuickSearchData, QuickSearchResponseData, RandomGamesData, RandomGamesResponseData, SaveGameData, SaveImageData, SavePlaylistData, ServiceActionData, SetLocaleData, ThemeChangeData, ThemeListChangeData, UpdateConfigData, ViewGame, WrappedRequest, WrappedResponse } from '@shared/back/types';
+import { overwriteConfigData } from '@shared/config/util';
+import { LOGOS, SCREENSHOTS } from '@shared/constants';
+import { findMostUsedApplicationPaths } from '@shared/curate/defaultValues';
+import { stringifyCurationFormat } from '@shared/curate/format/stringifier';
+import { convertToCurationMeta } from '@shared/curate/metaToMeta';
+import { FilterGameOpts, filterGames, orderGames, orderGamesInPlaylist } from '@shared/game/GameFilter';
+import { IAdditionalApplicationInfo, IGameInfo } from '@shared/game/interfaces';
+import { DeepPartial, GamePlaylist, IBackProcessInfo, IService, ProcessAction, RecursivePartial } from '@shared/interfaces';
+import { autoCode, getDefaultLocalization, LangContainer, LangFile, LangFileContent } from '@shared/lang';
+import { ILogEntry, ILogPreEntry } from '@shared/Log/interface';
+import { GameOrderBy, GameOrderReverse } from '@shared/order/interfaces';
+import { PreferencesFile } from '@shared/preferences/PreferencesFile';
+import { defaultPreferencesData, overwritePreferenceData } from '@shared/preferences/util';
+import { parseThemeMetaData, themeEntryFilename, ThemeMeta } from '@shared/ThemeFile';
+import { createErrorProxy, deepCopy, isErrorProxy, recursiveReplace, removeFileExtension, stringifyArray } from '@shared/Util';
+import { Coerce } from '@shared/utils/Coerce';
 import { ConfigFile } from './ConfigFile';
 import { loadExecMappingsFile } from './Execs';
 import { GameManager } from './game/GameManager';

diff --git a/src/back/suggestions.ts b/src/back/suggestions.ts
@@ -1,5 +1,5 @@
-import { IGameInfo } from '../shared/game/interfaces';
-import { GamePropSuggestions, GamePropSuggestionsMap, SuggestionProps } from '../shared/interfaces';
+import { IGameInfo } from '@shared/game/interfaces';
+import { GamePropSuggestions, GamePropSuggestionsMap, SuggestionProps } from '@shared/interfaces';
 
 export function getSuggestions(games: IGameInfo[] = [], libraryTitles: string[] = []): Partial<GamePropSuggestions> {
   // Get the values from the game collection & libraries

diff --git a/src/back/tsconfig.json b/src/back/tsconfig.json
diff --git a/src/back/types.ts b/src/back/types.ts
@@ -2,15 +2,15 @@ import { MessageBoxOptions, OpenExternalOptions } from 'electron';
 import { EventEmitter } from 'events';
 import { Server } from 'http';
 import * as WebSocket from 'ws';
-import { BackInit, ViewGame, WrappedRequest } from '../shared/back/types';
-import { IAppConfigData } from '../shared/config/interfaces';
-import { IGameInfo } from '../shared/game/interfaces';
-import { ExecMapping, GamePlaylist, IBackProcessInfo } from '../shared/interfaces';
-import { LangContainer, LangFile } from '../shared/lang';
-import { ILogEntry, ILogPreEntry } from '../shared/Log/interface';
-import { GameOrderBy, GameOrderReverse } from '../shared/order/interfaces';
-import { IAppPreferencesData } from '../shared/preferences/interfaces';
-import { Theme } from '../shared/ThemeFile';
+import { BackInit, ViewGame, WrappedRequest } from '@shared/back/types';
+import { IAppConfigData } from '@shared/config/interfaces';
+import { IGameInfo } from '@shared/game/interfaces';
+import { ExecMapping, GamePlaylist, IBackProcessInfo } from '@shared/interfaces';
+import { LangContainer, LangFile } from '@shared/lang';
+import { ILogEntry, ILogPreEntry } from '@shared/Log/interface';
+import { GameOrderBy, GameOrderReverse } from '@shared/order/interfaces';
+import { IAppPreferencesData } from '@shared/preferences/interfaces';
+import { Theme } from '@shared/ThemeFile';
 import { GameManagerState } from './game/types';
 import { ManagedChildProcess } from './ManagedChildProcess';
 import { EventQueue } from './util/EventQueue';

diff --git a/src/back/util/debounce.ts b/src/back/util/debounce.ts
@@ -1,5 +1,5 @@
-import { AnyFunction, ArgumentTypesOf } from '../../shared/interfaces';
-import { shallowStrictEquals } from '../../shared/Util';
+import { AnyFunction, ArgumentTypesOf } from '@shared/interfaces';
+import { shallowStrictEquals } from '@shared/Util';
 
 /** A callable object that has the same argument types as T (and void as the return type). */
 interface CallableCopy<T extends AnyFunction> extends Function {

diff --git a/src/main/MainWindowPreload.ts b/src/main/MainWindowPreload.ts
@@ -1,11 +1,11 @@
 import * as electron from 'electron';
 import { OpenDialogOptions } from 'electron';
 import * as path from 'path';
-import { SharedSocket } from '../shared/back/SharedSocket';
-import { BackIn, BackOut, GetRendererInitDataResponse, OpenDialogData, OpenDialogResponseData, OpenExternalData, OpenExternalResponseData, WrappedResponse } from '../shared/back/types';
-import { InitRendererChannel, InitRendererData } from '../shared/IPC';
-import { setTheme } from '../shared/Theme';
-import { createErrorProxy } from '../shared/Util';
+import { SharedSocket } from '@shared/back/SharedSocket';
+import { BackIn, BackOut, GetRendererInitDataResponse, OpenDialogData, OpenDialogResponseData, OpenExternalData, OpenExternalResponseData, WrappedResponse } from '@shared/back/types';
+import { InitRendererChannel, InitRendererData } from '@shared/IPC';
+import { setTheme } from '@shared/Theme';
+import { createErrorProxy } from '@shared/Util';
 import { isDev } from './Util';
 
 /**

diff --git a/src/main/index.ts b/src/main/index.ts
@@ -5,14 +5,14 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { promisify } from 'util';
 import * as WebSocket from 'ws';
-import { SharedSocket } from '../shared/back/SharedSocket';
-import { BackIn, BackInitArgs, BackOut, GetMainInitDataResponse, SetLocaleData, WrappedRequest, WrappedResponse } from '../shared/back/types';
-import { IAppConfigData } from '../shared/config/interfaces';
-import { APP_TITLE } from '../shared/constants';
-import { WindowIPC } from '../shared/interfaces';
-import { InitRendererChannel, InitRendererData } from '../shared/IPC';
-import { IAppPreferencesData } from '../shared/preferences/interfaces';
-import { Coerce } from '../shared/utils/Coerce';
+import { SharedSocket } from '@shared/back/SharedSocket';
+import { BackIn, BackInitArgs, BackOut, GetMainInitDataResponse, SetLocaleData, WrappedRequest, WrappedResponse } from '@shared/back/types';
+import { IAppConfigData } from '@shared/config/interfaces';
+import { APP_TITLE } from '@shared/constants';
+import { WindowIPC } from '@shared/interfaces';
+import { InitRendererChannel, InitRendererData } from '@shared/IPC';
+import { IAppPreferencesData } from '@shared/preferences/interfaces';
+import { Coerce } from '@shared/utils/Coerce';
 import * as Util from './Util';
 
 const readFile = promisify(fs.readFile);

diff --git a/src/main/tsconfig.json b/src/main/tsconfig.json
diff --git a/src/renderer/Util.ts b/src/renderer/Util.ts
@@ -1,10 +1,10 @@
 import { remote } from 'electron';
 import * as fs from 'fs';
 import * as path from 'path';
-import { AddLogData, BackIn } from '../shared/back/types';
-import { htdocsPath } from '../shared/constants';
-import { IGameInfo } from '../shared/game/interfaces';
-import { getFileServerURL } from '../shared/Util';
+import { AddLogData, BackIn } from '@shared/back/types';
+import { htdocsPath } from '@shared/constants';
+import { IGameInfo } from '@shared/game/interfaces';
+import { getFileServerURL } from '@shared/Util';
 import { Paths } from './Paths';
 
 export const gameIdDataType: string = 'text/game-id';