Add type imports, add two eslint rules

* Add eslint rule forbidding "import * as foo"
* Add eslint rule enforcing newline after imports

.eslintrc.json

@@ -65,6 +65,8 @@
                 }
             }
         ],
+        "import/no-namespace": "error",
+        "import/newline-after-import": "error",
         "@typescript-eslint/no-unused-vars": "error",
         "@typescript-eslint/explicit-module-boundary-types": "error",
         "no-console": "error",

api.spec.ts

@@ -1,8 +1,8 @@
-import { MaybeMocked, MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
+import type { MaybeMocked, MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
 import { fetchChromiumTags, fetchBranchPosition, fetchChromeUrl, fetchChromeZipFile, fetchLocalStore } from './api'
-import { IOSSettings } from './interfaces/os.interfaces'
+import type { IOSSettings } from './interfaces/os.interfaces'
 import { logger, Spinner } from './log/spinner'
 
 /* eslint-disable-next-line @typescript-eslint/no-var-requires */

api.ts

@@ -1,9 +1,9 @@
 import { Response as NodeFetchResponse } from 'node-fetch'
 
 import { RESOLVE_VERSION } from './commons/constants'
-import { IMetadataResponse } from './interfaces/interfaces'
-import { IOSSettings } from './interfaces/os.interfaces'
-import { IListStore } from './interfaces/store.interfaces'
+import type { IMetadataResponse } from './interfaces/interfaces'
+import type { IOSSettings } from './interfaces/os.interfaces'
+import type { IListStore } from './interfaces/store.interfaces'
 import { logger } from './log/spinner'
 
 /* eslint-disable-next-line @typescript-eslint/no-var-requires */

commons/ComparableVersion.ts

@@ -1,4 +1,4 @@
-import { IVersion } from '../interfaces/interfaces'
+import type { IVersion } from '../interfaces/interfaces'
 import { isIVersion } from '../utils'
 
 export class ComparableVersion implements IVersion {

commons/MappedVersion.spec.ts

@@ -1,5 +1,6 @@
-import { IVersionWithDisabled } from '../interfaces/interfaces'
+import type { IVersionWithDisabled } from '../interfaces/interfaces'
 import { MappedVersion } from './MappedVersion'
+
 describe('MappedVersion', () => {
     describe('string input', () => {
         it('should create a MappedVersion with first input', () => {

commons/MappedVersion.ts

@@ -1,4 +1,4 @@
-import { IVersionWithDisabled } from '../interfaces/interfaces'
+import type { IVersionWithDisabled } from '../interfaces/interfaces'
 import { isIVersionWithDisabled } from '../utils'
 import { ComparableVersion } from './ComparableVersion'
 

commons/constants.spec.ts

@@ -1,5 +1,6 @@
-import { TextFunction } from '../interfaces/interfaces'
+import type { TextFunction } from '../interfaces/interfaces'
 import { READ_CONFIG } from './constants'
+
 describe('constants', () => {
 
     it('should add the reason in the description', () => {

commons/constants.ts

@@ -1,4 +1,4 @@
-import { LoggerConfig } from '../interfaces/interfaces'
+import type { LoggerConfig } from '../interfaces/interfaces'
 
 export const LOAD_CONFIG: LoggerConfig = {
     start: 'Downloading local storage file',

config/config.spec.ts

@@ -1,9 +1,9 @@
-import { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
+import type { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
 import { ComparableVersion } from '../commons/ComparableVersion'
-import { IChromeConfigWrapper, IStoreConfigWrapper, IExportConfigWrapper } from '../interfaces/interfaces'
-import { OS } from '../interfaces/os.interfaces'
+import type { IChromeConfigWrapper, IStoreConfigWrapper, IExportConfigWrapper } from '../interfaces/interfaces'
+import type { OS } from '../interfaces/os.interfaces'
 import { Spinner, logger } from '../log/spinner'
 import { createChromeConfig, createChromeOptions, createImportConfig, createExportConfig } from '../test.utils'
 import { DEFAULT_OPTIONS, readConfig } from './config'

config/config.ts

@@ -1,10 +1,12 @@
 
+/* eslint-disable-next-line import/no-namespace */
 import * as program from 'commander'
 
 import { ComparableVersion } from '../commons/ComparableVersion'
-import { IConfigOptions } from '../interfaces/config.interfaces'
+import type { IConfigOptions } from '../interfaces/config.interfaces'
 import { ConfigWrapper } from '../interfaces/interfaces'
 import { logger } from '../log/spinner'
+/* eslint-disable-next-line import/no-namespace */
 import * as packageJson from '../package.json'
 import { mapOS } from '../utils'
 

download.spec.ts

@@ -1,7 +1,8 @@
 import { existsSync, mkdir, createWriteStream, stat, rmdir, unlink, Stats } from 'fs'
 import { Response as NodeFetchResponse } from 'node-fetch'
-import { MaybeMocked, MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
+import type { MaybeMocked, MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
+/* eslint-disable-next-line import/no-namespace */
 import * as unzipper from 'unzipper'
 
 import { fetchChromeZipFile } from './api'

download.ts

@@ -1,11 +1,12 @@
 import { existsSync, mkdir as fsMkdir, createWriteStream, stat as fsStat, rmdir as fsRmdir, unlink as fsUnlink } from 'fs'
-import * as path from 'path'
+import { join as pathJoin } from 'path'
+/* eslint-disable-next-line import/no-namespace */
 import * as unzipper from 'unzipper'
 import { promisify } from 'util'
 
 import { fetchChromeZipFile } from './api'
 import { NoChromiumDownloadError } from './errors'
-import { IChromeConfig } from './interfaces/interfaces'
+import type { IChromeConfig } from './interfaces/interfaces'
 import { progress } from './log/progress'
 import { logger } from './log/spinner'
 import { loadStore } from './store/loadStore'
@@ -48,7 +49,7 @@ export async function downloadChromium(config: IChromeConfig): Promise<void> {
     if (chromeUrl && config.download) {
         const filename = `chrome-${filenameOS}-${config.arch}-${selectedVersion}`
         const downloadPath = config.downloadFolder
-            ? path.join(config.downloadFolder, filename)
+            ? pathJoin(config.downloadFolder, filename)
             : filename
 
         if (!!config.downloadFolder && !existsSync(config.downloadFolder)) {

files

@@ -0,0 +1,49 @@
+./errors.ts
+./download.spec.ts
+./rusted.ts
+./start-local.ts
+./interfaces/os.interfaces.ts
+./interfaces/config.interfaces.ts
+./interfaces/store.interfaces.ts
+./interfaces/interfaces.ts
+./versions.ts
+./utils.ts
+./rusted.spec.ts
+./api.ts
+./api.spec.ts
+./utils.spec.ts
+./select.ts
+./select.spec.ts
+./commons/ComparableVersion.ts
+./commons/ComparableVersion.spec.ts
+./commons/constants.ts
+./commons/MappedVersion.ts
+./commons/constants.spec.ts
+./commons/MappedVersion.spec.ts
+./test.utils.ts
+./store/exportStore.ts
+./store/storeNegativeHit.spec.ts
+./store/storeNegativeHit.ts
+./store/loadStore.ts
+./store/downloadStore.ts
+./store/readStore.ts
+./store/loadStore.spec.ts
+./store/Store.spec.ts
+./store/downloadStore.spec.ts
+./store/readStore.spec.ts
+./store/importStore.spec.ts
+./store/exportStore.spec.ts
+./store/Store.ts
+./store/importStore.ts
+./config/config.spec.ts
+./config/config.ts
+./errors.spec.ts
+./download.ts
+./versions.spec.ts
+./public_api.ts
+./log/spinner.spec.ts
+./log/printer.ts
+./log/printer.spec.ts
+./log/spinner.ts
+./log/progress.spec.ts
+./log/progress.ts

interfaces/config.interfaces.ts

@@ -1,4 +1,4 @@
-import { ExtendedOS } from './os.interfaces'
+import type { ExtendedOS } from './os.interfaces'
 
 export interface IConfigOptions {
     min: string

interfaces/interfaces.ts

@@ -1,6 +1,6 @@
 import { ComparableVersion } from '../commons/ComparableVersion'
-import { OS } from './os.interfaces'
-import { Arch } from './store.interfaces'
+import type { OS } from './os.interfaces'
+import type { Arch } from './store.interfaces'
 
 export interface IStoreConfigWrapper {
     action: 'importStore'

interfaces/store.interfaces.ts

@@ -1,4 +1,4 @@
-import { OS } from './os.interfaces'
+import type { OS } from './os.interfaces'
 
 export type Arch = keyof LinuxStore | keyof WinStore | keyof MacStore
 

log/printer.spec.ts

@@ -1,4 +1,4 @@
-import { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
+import type { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 
 import { PrinterWriteStream } from '../interfaces/printer.interfaces'
 import { Printer } from './printer'

log/printer.ts

@@ -1,3 +1,4 @@
+/* eslint-disable-next-line import/no-namespace */
 import * as chalk from 'chalk'
 
 import { PrinterWriteStream } from '../interfaces/printer.interfaces'

log/progress.spec.ts

@@ -1,6 +1,6 @@
-import { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
+import type { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 
-import { PrinterWriteStream } from '../interfaces/printer.interfaces'
+import type { PrinterWriteStream } from '../interfaces/printer.interfaces'
 import { ProgressBar } from './progress'
 
 jest.mock('chalk', () => ({

log/progress.ts

@@ -1,6 +1,7 @@
+/* eslint-disable-next-line import/no-namespace */
 import * as chalk from 'chalk'
 
-import { ProgressConfig } from '../interfaces/interfaces'
+import type { ProgressConfig } from '../interfaces/interfaces'
 import { Printer } from './printer'
 
 export class ProgressBar extends Printer<ProgressBar> {

log/spinner.spec.ts

@@ -1,8 +1,9 @@
+/* eslint-disable-next-line import/no-namespace */
 import * as chalk from 'chalk'
-import { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
+import type { MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
-import { PrinterWriteStream } from '../interfaces/printer.interfaces'
+import type { PrinterWriteStream } from '../interfaces/printer.interfaces'
 import { Spinner } from './spinner'
 
 jest.mock('chalk', () => ({

rusted.spec.ts

@@ -1,9 +1,9 @@
-import { MaybeMocked, MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
+import type { MaybeMocked, MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
 import { readConfig } from './config/config'
 import { downloadChromium } from './download'
-import { ConfigWrapper } from './interfaces/interfaces'
+import type { ConfigWrapper } from './interfaces/interfaces'
 import { logger } from './log/spinner'
 import { rusted } from './rusted'
 import { exportStore } from './store/exportStore'

rusted.ts

@@ -1,6 +1,6 @@
 import { readConfig } from './config/config'
 import { downloadChromium } from './download'
-import { IChromeConfig, IStoreConfig, IExportConfig } from './interfaces/interfaces'
+import type { IChromeConfig, IStoreConfig, IExportConfig } from './interfaces/interfaces'
 import { logger } from './log/spinner'
 import { exportStore } from './store/exportStore'
 import { importAndMergeLocalstore } from './store/importStore'

select.spec.ts

@@ -1,4 +1,4 @@
-import { MaybeMocked } from 'ts-jest/dist/utils/testing'
+import type { MaybeMocked } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
 import { MappedVersion } from './commons/MappedVersion'

select.ts

@@ -1,7 +1,8 @@
+/* eslint-disable-next-line import/no-namespace */
 import * as prompts from 'prompts'
 
 import { MappedVersion } from './commons/MappedVersion'
-import { IChromeConfig } from './interfaces/interfaces'
+import type { IChromeConfig } from './interfaces/interfaces'
 
 /**
  * Lets the user select a version via CLI prompt and returns it.

store/Store.spec.ts

@@ -1,5 +1,5 @@
 import { ComparableVersion } from '../commons/ComparableVersion'
-import { Arch } from '../interfaces/store.interfaces'
+import type { Arch } from '../interfaces/store.interfaces'
 import { createStore } from '../test.utils'
 import { Store } from './Store'
 

store/Store.ts

@@ -1,6 +1,6 @@
-import { ComparableVersion } from '../commons/ComparableVersion'
-import { OS } from '../interfaces/os.interfaces'
-import { Arch, IListStore as IListStore, StoreSize, ISetStore } from '../interfaces/store.interfaces'
+import type { ComparableVersion } from '../commons/ComparableVersion'
+import type { OS } from '../interfaces/os.interfaces'
+import type { Arch, IListStore as IListStore, StoreSize, ISetStore } from '../interfaces/store.interfaces'
 import { setStoreToListStore, sortStoreEntries } from '../utils'
 
 export class Store {

store/downloadStore.spec.ts

@@ -1,4 +1,4 @@
-import { MaybeMockedDeep, MaybeMocked } from 'ts-jest/dist/utils/testing'
+import type { MaybeMockedDeep, MaybeMocked } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
 import { fetchLocalStore } from '../api'

store/downloadStore.ts

@@ -1,6 +1,6 @@
 import { fetchLocalStore } from '../api'
 import { LOAD_CONFIG } from '../commons/constants'
-import { IStoreConfig } from '../interfaces/interfaces'
+import type { IStoreConfig } from '../interfaces/interfaces'
 import { logger } from '../log/spinner'
 import { Store } from './Store'
 

store/exportStore.spec.ts

@@ -1,6 +1,6 @@
 import { existsSync, createReadStream, ReadStream } from 'fs'
 import { join } from 'path'
-import { MaybeMocked, MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
+import type { MaybeMocked, MaybeMockedDeep } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
 import { LOCAL_STORE_FILE } from '../commons/constants'

store/importStore.spec.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFile, writeFile } from 'fs'
-import * as path from 'path'
-import { MaybeMocked } from 'ts-jest/dist/utils/testing'
+import { join as pathJoin } from 'path'
+import type { MaybeMocked } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
 import { LOCAL_STORE_FILE } from '../commons/constants'
@@ -63,7 +63,7 @@ describe('importStore', () => {
             expect(readFileMock).toHaveBeenCalledTimes(0)
 
             expect(writeFileMock).toHaveBeenCalledTimes(1)
-            expect(writeFileMock).toHaveBeenCalledWith(path.join(__dirname, '..', LOCAL_STORE_FILE), anyStore.toFormattedString(), expect.any(Function))
+            expect(writeFileMock).toHaveBeenCalledWith(pathJoin(__dirname, '..', LOCAL_STORE_FILE), anyStore.toFormattedString(), expect.any(Function))
 
         })
 
@@ -87,7 +87,7 @@ describe('importStore', () => {
             expect(readFileMock).toHaveBeenCalledTimes(0)
 
             expect(writeFileMock).toHaveBeenCalledTimes(1)
-            expect(writeFileMock).toHaveBeenCalledWith(path.join(__dirname, '..', LOCAL_STORE_FILE), anyStore.toFormattedString(), expect.any(Function))
+            expect(writeFileMock).toHaveBeenCalledWith(pathJoin(__dirname, '..', LOCAL_STORE_FILE), anyStore.toFormattedString(), expect.any(Function))
         })
 
         it('should do nothing, if no store file is loaded from file system', async () => {
@@ -164,7 +164,7 @@ describe('importStore', () => {
             expect(readFileMock).toHaveBeenCalledTimes(1)
 
             expect(writeFileMock).toHaveBeenCalledTimes(1)
-            expect(writeFileMock).toHaveBeenCalledWith(path.join(__dirname, '..', LOCAL_STORE_FILE), JSON.stringify(mergedStore, null, 4), expect.any(Function))
+            expect(writeFileMock).toHaveBeenCalledWith(pathJoin(__dirname, '..', LOCAL_STORE_FILE), JSON.stringify(mergedStore, null, 4), expect.any(Function))
         })
 
         it('should merge the existing file with the file downloaded by local file', async () => {
@@ -201,7 +201,7 @@ describe('importStore', () => {
             expect(readFileMock).toHaveBeenCalledTimes(1)
 
             expect(writeFileMock).toHaveBeenCalledTimes(1)
-            expect(writeFileMock).toHaveBeenCalledWith(path.join(__dirname, '..', LOCAL_STORE_FILE), JSON.stringify(mergedStore, null, 4), expect.any(Function))
+            expect(writeFileMock).toHaveBeenCalledWith(pathJoin(__dirname, '..', LOCAL_STORE_FILE), JSON.stringify(mergedStore, null, 4), expect.any(Function))
         })
     })
 })

store/importStore.ts

@@ -3,11 +3,11 @@ import { join } from 'path'
 import { promisify } from 'util'
 
 import { LOCAL_STORE_FILE } from '../commons/constants'
-import { IStoreConfig } from '../interfaces/interfaces'
-import { StoreSize } from '../interfaces/store.interfaces'
+import type { IStoreConfig } from '../interfaces/interfaces'
+import type { StoreSize } from '../interfaces/store.interfaces'
 import { downloadStore } from './downloadStore'
 import { readStoreFile } from './readStore'
-import { Store } from './Store'
+import type { Store } from './Store'
 
 const writeFilePromise = promisify(writeFile)
 const readFilePromise = promisify(readFile)

store/loadStore.spec.ts

@@ -1,6 +1,6 @@
 import { existsSync, readFile } from 'fs'
-import * as path from 'path'
-import { MaybeMocked } from 'ts-jest/dist/utils/testing'
+import { join as pathJoin } from 'path'
+import type { MaybeMocked } from 'ts-jest/dist/utils/testing'
 import { mocked } from 'ts-jest/utils'
 
 import { createStore, ReadFileWithOptions } from '../test.utils'
@@ -9,7 +9,7 @@ import { Store } from './Store'
 
 jest.mock('fs')
 
-const localPath = path.join(__dirname, '..', 'localstore.json')
+const localPath = pathJoin(__dirname, '..', 'localstore.json')
 
 describe('loadStore', () => {