From c60d0e7392fc708e961614d6b756a045de74f458 Mon Sep 17 00:00:00 2001 From: Shin'ya Ueoka Date: Tue, 30 Apr 2019 14:00:07 +0900 Subject: Rename .js/.jsx to .ts/.tsx --- .../controllers/AddonEnabledController.js | 11 --- .../controllers/AddonEnabledController.ts | 11 +++ src/background/controllers/CommandController.js | 99 ---------------------- src/background/controllers/CommandController.ts | 99 ++++++++++++++++++++++ src/background/controllers/FindController.js | 15 ---- src/background/controllers/FindController.ts | 15 ++++ src/background/controllers/LinkController.js | 15 ---- src/background/controllers/LinkController.ts | 15 ++++ src/background/controllers/MarkController.js | 15 ---- src/background/controllers/MarkController.ts | 15 ++++ src/background/controllers/OperationController.js | 77 ----------------- src/background/controllers/OperationController.ts | 77 +++++++++++++++++ src/background/controllers/SettingController.js | 18 ---- src/background/controllers/SettingController.ts | 18 ++++ src/background/controllers/VersionController.js | 11 --- src/background/controllers/VersionController.ts | 11 +++ src/background/controllers/version.js | 13 --- src/background/controllers/version.ts | 13 +++ 18 files changed, 274 insertions(+), 274 deletions(-) delete mode 100644 src/background/controllers/AddonEnabledController.js create mode 100644 src/background/controllers/AddonEnabledController.ts delete mode 100644 src/background/controllers/CommandController.js create mode 100644 src/background/controllers/CommandController.ts delete mode 100644 src/background/controllers/FindController.js create mode 100644 src/background/controllers/FindController.ts delete mode 100644 src/background/controllers/LinkController.js create mode 100644 src/background/controllers/LinkController.ts delete mode 100644 src/background/controllers/MarkController.js create mode 100644 src/background/controllers/MarkController.ts delete mode 100644 src/background/controllers/OperationController.js create mode 100644 src/background/controllers/OperationController.ts delete mode 100644 src/background/controllers/SettingController.js create mode 100644 src/background/controllers/SettingController.ts delete mode 100644 src/background/controllers/VersionController.js create mode 100644 src/background/controllers/VersionController.ts delete mode 100644 src/background/controllers/version.js create mode 100644 src/background/controllers/version.ts (limited to 'src/background/controllers') diff --git a/src/background/controllers/AddonEnabledController.js b/src/background/controllers/AddonEnabledController.js deleted file mode 100644 index 9a3a521..0000000 --- a/src/background/controllers/AddonEnabledController.js +++ /dev/null @@ -1,11 +0,0 @@ -import AddonEnabledUseCase from '../usecases/AddonEnabledUseCase'; - -export default class AddonEnabledController { - constructor() { - this.addonEnabledUseCase = new AddonEnabledUseCase(); - } - - indicate(enabled) { - return this.addonEnabledUseCase.indicate(enabled); - } -} diff --git a/src/background/controllers/AddonEnabledController.ts b/src/background/controllers/AddonEnabledController.ts new file mode 100644 index 0000000..9a3a521 --- /dev/null +++ b/src/background/controllers/AddonEnabledController.ts @@ -0,0 +1,11 @@ +import AddonEnabledUseCase from '../usecases/AddonEnabledUseCase'; + +export default class AddonEnabledController { + constructor() { + this.addonEnabledUseCase = new AddonEnabledUseCase(); + } + + indicate(enabled) { + return this.addonEnabledUseCase.indicate(enabled); + } +} diff --git a/src/background/controllers/CommandController.js b/src/background/controllers/CommandController.js deleted file mode 100644 index b113709..0000000 --- a/src/background/controllers/CommandController.js +++ /dev/null @@ -1,99 +0,0 @@ -import CompletionsUseCase from '../usecases/CompletionsUseCase'; -import CommandUseCase from '../usecases/CommandUseCase'; -import Completions from '../domains/Completions'; - -const trimStart = (str) => { - // NOTE String.trimStart is available on Firefox 61 - return str.replace(/^\s+/, ''); -}; - -export default class CommandController { - constructor() { - this.completionsUseCase = new CompletionsUseCase(); - this.commandIndicator = new CommandUseCase(); - } - - getCompletions(line) { - let trimmed = trimStart(line); - let words = trimmed.split(/ +/); - let name = words[0]; - if (words.length === 1) { - return this.completionsUseCase.queryConsoleCommand(name); - } - let keywords = trimStart(trimmed.slice(name.length)); - switch (words[0]) { - case 'o': - case 'open': - case 't': - case 'tabopen': - case 'w': - case 'winopen': - return this.completionsUseCase.queryOpen(name, keywords); - case 'b': - case 'buffer': - return this.completionsUseCase.queryBuffer(name, keywords); - case 'bd': - case 'bdel': - case 'bdelete': - case 'bdeletes': - return this.completionsUseCase.queryBdelete(name, keywords); - case 'bd!': - case 'bdel!': - case 'bdelete!': - case 'bdeletes!': - return this.completionsUseCase.queryBdeleteForce(name, keywords); - case 'set': - return this.completionsUseCase.querySet(name, keywords); - } - return Promise.resolve(Completions.empty()); - } - - // eslint-disable-next-line complexity - exec(line) { - let trimmed = trimStart(line); - let words = trimmed.split(/ +/); - let name = words[0]; - if (words[0].length === 0) { - return Promise.resolve(); - } - - let keywords = trimStart(trimmed.slice(name.length)); - switch (words[0]) { - case 'o': - case 'open': - return this.commandIndicator.open(keywords); - case 't': - case 'tabopen': - return this.commandIndicator.tabopen(keywords); - case 'w': - case 'winopen': - return this.commandIndicator.winopen(keywords); - case 'b': - case 'buffer': - return this.commandIndicator.buffer(keywords); - case 'bd': - case 'bdel': - case 'bdelete': - return this.commandIndicator.bdelete(false, keywords); - case 'bd!': - case 'bdel!': - case 'bdelete!': - return this.commandIndicator.bdelete(true, keywords); - case 'bdeletes': - return this.commandIndicator.bdeletes(false, keywords); - case 'bdeletes!': - return this.commandIndicator.bdeletes(true, keywords); - case 'addbookmark': - return this.commandIndicator.addbookmark(keywords); - case 'q': - case 'quit': - return this.commandIndicator.quit(); - case 'qa': - case 'quitall': - return this.commandIndicator.quitAll(); - case 'set': - return this.commandIndicator.set(keywords); - } - throw new Error(words[0] + ' command is not defined'); - } -} diff --git a/src/background/controllers/CommandController.ts b/src/background/controllers/CommandController.ts new file mode 100644 index 0000000..b113709 --- /dev/null +++ b/src/background/controllers/CommandController.ts @@ -0,0 +1,99 @@ +import CompletionsUseCase from '../usecases/CompletionsUseCase'; +import CommandUseCase from '../usecases/CommandUseCase'; +import Completions from '../domains/Completions'; + +const trimStart = (str) => { + // NOTE String.trimStart is available on Firefox 61 + return str.replace(/^\s+/, ''); +}; + +export default class CommandController { + constructor() { + this.completionsUseCase = new CompletionsUseCase(); + this.commandIndicator = new CommandUseCase(); + } + + getCompletions(line) { + let trimmed = trimStart(line); + let words = trimmed.split(/ +/); + let name = words[0]; + if (words.length === 1) { + return this.completionsUseCase.queryConsoleCommand(name); + } + let keywords = trimStart(trimmed.slice(name.length)); + switch (words[0]) { + case 'o': + case 'open': + case 't': + case 'tabopen': + case 'w': + case 'winopen': + return this.completionsUseCase.queryOpen(name, keywords); + case 'b': + case 'buffer': + return this.completionsUseCase.queryBuffer(name, keywords); + case 'bd': + case 'bdel': + case 'bdelete': + case 'bdeletes': + return this.completionsUseCase.queryBdelete(name, keywords); + case 'bd!': + case 'bdel!': + case 'bdelete!': + case 'bdeletes!': + return this.completionsUseCase.queryBdeleteForce(name, keywords); + case 'set': + return this.completionsUseCase.querySet(name, keywords); + } + return Promise.resolve(Completions.empty()); + } + + // eslint-disable-next-line complexity + exec(line) { + let trimmed = trimStart(line); + let words = trimmed.split(/ +/); + let name = words[0]; + if (words[0].length === 0) { + return Promise.resolve(); + } + + let keywords = trimStart(trimmed.slice(name.length)); + switch (words[0]) { + case 'o': + case 'open': + return this.commandIndicator.open(keywords); + case 't': + case 'tabopen': + return this.commandIndicator.tabopen(keywords); + case 'w': + case 'winopen': + return this.commandIndicator.winopen(keywords); + case 'b': + case 'buffer': + return this.commandIndicator.buffer(keywords); + case 'bd': + case 'bdel': + case 'bdelete': + return this.commandIndicator.bdelete(false, keywords); + case 'bd!': + case 'bdel!': + case 'bdelete!': + return this.commandIndicator.bdelete(true, keywords); + case 'bdeletes': + return this.commandIndicator.bdeletes(false, keywords); + case 'bdeletes!': + return this.commandIndicator.bdeletes(true, keywords); + case 'addbookmark': + return this.commandIndicator.addbookmark(keywords); + case 'q': + case 'quit': + return this.commandIndicator.quit(); + case 'qa': + case 'quitall': + return this.commandIndicator.quitAll(); + case 'set': + return this.commandIndicator.set(keywords); + } + throw new Error(words[0] + ' command is not defined'); + } +} diff --git a/src/background/controllers/FindController.js b/src/background/controllers/FindController.js deleted file mode 100644 index caeff98..0000000 --- a/src/background/controllers/FindController.js +++ /dev/null @@ -1,15 +0,0 @@ -import FindUseCase from '../usecases/FindUseCase'; - -export default class FindController { - constructor() { - this.findUseCase = new FindUseCase(); - } - - getKeyword() { - return this.findUseCase.getKeyword(); - } - - setKeyword(keyword) { - return this.findUseCase.setKeyword(keyword); - } -} diff --git a/src/background/controllers/FindController.ts b/src/background/controllers/FindController.ts new file mode 100644 index 0000000..caeff98 --- /dev/null +++ b/src/background/controllers/FindController.ts @@ -0,0 +1,15 @@ +import FindUseCase from '../usecases/FindUseCase'; + +export default class FindController { + constructor() { + this.findUseCase = new FindUseCase(); + } + + getKeyword() { + return this.findUseCase.getKeyword(); + } + + setKeyword(keyword) { + return this.findUseCase.setKeyword(keyword); + } +} diff --git a/src/background/controllers/LinkController.js b/src/background/controllers/LinkController.js deleted file mode 100644 index 7e395b1..0000000 --- a/src/background/controllers/LinkController.js +++ /dev/null @@ -1,15 +0,0 @@ -import LinkUseCase from '../usecases/LinkUseCase'; - -export default class LinkController { - constructor() { - this.linkUseCase = new LinkUseCase(); - } - - openToTab(url, tabId) { - this.linkUseCase.openToTab(url, tabId); - } - - openNewTab(url, openerId, background) { - this.linkUseCase.openNewTab(url, openerId, background); - } -} diff --git a/src/background/controllers/LinkController.ts b/src/background/controllers/LinkController.ts new file mode 100644 index 0000000..7e395b1 --- /dev/null +++ b/src/background/controllers/LinkController.ts @@ -0,0 +1,15 @@ +import LinkUseCase from '../usecases/LinkUseCase'; + +export default class LinkController { + constructor() { + this.linkUseCase = new LinkUseCase(); + } + + openToTab(url, tabId) { + this.linkUseCase.openToTab(url, tabId); + } + + openNewTab(url, openerId, background) { + this.linkUseCase.openNewTab(url, openerId, background); + } +} diff --git a/src/background/controllers/MarkController.js b/src/background/controllers/MarkController.js deleted file mode 100644 index 0478369..0000000 --- a/src/background/controllers/MarkController.js +++ /dev/null @@ -1,15 +0,0 @@ -import MarkUseCase from '../usecases/MarkUseCase'; - -export default class MarkController { - constructor() { - this.markUseCase = new MarkUseCase(); - } - - setGlobal(key, x, y) { - this.markUseCase.setGlobal(key, x, y); - } - - jumpGlobal(key) { - this.markUseCase.jumpGlobal(key); - } -} diff --git a/src/background/controllers/MarkController.ts b/src/background/controllers/MarkController.ts new file mode 100644 index 0000000..0478369 --- /dev/null +++ b/src/background/controllers/MarkController.ts @@ -0,0 +1,15 @@ +import MarkUseCase from '../usecases/MarkUseCase'; + +export default class MarkController { + constructor() { + this.markUseCase = new MarkUseCase(); + } + + setGlobal(key, x, y) { + this.markUseCase.setGlobal(key, x, y); + } + + jumpGlobal(key) { + this.markUseCase.jumpGlobal(key); + } +} diff --git a/src/background/controllers/OperationController.js b/src/background/controllers/OperationController.js deleted file mode 100644 index 416aa9c..0000000 --- a/src/background/controllers/OperationController.js +++ /dev/null @@ -1,77 +0,0 @@ -import operations from '../../shared/operations'; -import FindUseCase from '../usecases/FindUseCase'; -import ConsoleUseCase from '../usecases/ConsoleUseCase'; -import TabUseCase from '../usecases/TabUseCase'; -import TabSelectUseCase from '../usecases/TabSelectUseCase'; -import ZoomUseCase from '../usecases/ZoomUseCase'; - -export default class OperationController { - constructor() { - this.findUseCase = new FindUseCase(); - this.consoleUseCase = new ConsoleUseCase(); - this.tabUseCase = new TabUseCase(); - this.tabSelectUseCase = new TabSelectUseCase(); - this.zoomUseCase = new ZoomUseCase(); - } - - // eslint-disable-next-line complexity, max-lines-per-function - exec(operation) { - switch (operation.type) { - case operations.TAB_CLOSE: - return this.tabUseCase.close(false); - case operations.TAB_CLOSE_RIGHT: - return this.tabUseCase.closeRight(); - case operations.TAB_CLOSE_FORCE: - return this.tabUseCase.close(true); - case operations.TAB_REOPEN: - return this.tabUseCase.reopen(); - case operations.TAB_PREV: - return this.tabSelectUseCase.selectPrev(1); - case operations.TAB_NEXT: - return this.tabSelectUseCase.selectNext(1); - case operations.TAB_FIRST: - return this.tabSelectUseCase.selectFirst(); - case operations.TAB_LAST: - return this.tabSelectUseCase.selectLast(); - case operations.TAB_PREV_SEL: - return this.tabSelectUseCase.selectPrevSelected(); - case operations.TAB_RELOAD: - return this.tabUseCase.reload(operation.cache); - case operations.TAB_PIN: - return this.tabUseCase.setPinned(true); - case operations.TAB_UNPIN: - return this.tabUseCase.setPinned(false); - case operations.TAB_TOGGLE_PINNED: - return this.tabUseCase.togglePinned(); - case operations.TAB_DUPLICATE: - return this.tabUseCase.duplicate(); - case operations.PAGE_SOURCE: - return this.tabUseCase.openPageSource(); - case operations.PAGE_HOME: - return this.tabUseCase.openHome(operation.newTab); - case operations.ZOOM_IN: - return this.zoomUseCase.zoomIn(); - case operations.ZOOM_OUT: - return this.zoomUseCase.zoomOut(); - case operations.ZOOM_NEUTRAL: - return this.zoomUseCase.zoomNutoral(); - case operations.COMMAND_SHOW: - return this.consoleUseCase.showCommand(); - case operations.COMMAND_SHOW_OPEN: - return this.consoleUseCase.showOpenCommand(operation.alter); - case operations.COMMAND_SHOW_TABOPEN: - return this.consoleUseCase.showTabopenCommand(operation.alter); - case operations.COMMAND_SHOW_WINOPEN: - return this.consoleUseCase.showWinopenCommand(operation.alter); - case operations.COMMAND_SHOW_BUFFER: - return this.consoleUseCase.showBufferCommand(); - case operations.COMMAND_SHOW_ADDBOOKMARK: - return this.consoleUseCase.showAddbookmarkCommand(operation.alter); - case operations.FIND_START: - return this.findUseCase.findStart(); - case operations.CANCEL: - return this.consoleUseCase.hideConsole(); - } - } -} - diff --git a/src/background/controllers/OperationController.ts b/src/background/controllers/OperationController.ts new file mode 100644 index 0000000..416aa9c --- /dev/null +++ b/src/background/controllers/OperationController.ts @@ -0,0 +1,77 @@ +import operations from '../../shared/operations'; +import FindUseCase from '../usecases/FindUseCase'; +import ConsoleUseCase from '../usecases/ConsoleUseCase'; +import TabUseCase from '../usecases/TabUseCase'; +import TabSelectUseCase from '../usecases/TabSelectUseCase'; +import ZoomUseCase from '../usecases/ZoomUseCase'; + +export default class OperationController { + constructor() { + this.findUseCase = new FindUseCase(); + this.consoleUseCase = new ConsoleUseCase(); + this.tabUseCase = new TabUseCase(); + this.tabSelectUseCase = new TabSelectUseCase(); + this.zoomUseCase = new ZoomUseCase(); + } + + // eslint-disable-next-line complexity, max-lines-per-function + exec(operation) { + switch (operation.type) { + case operations.TAB_CLOSE: + return this.tabUseCase.close(false); + case operations.TAB_CLOSE_RIGHT: + return this.tabUseCase.closeRight(); + case operations.TAB_CLOSE_FORCE: + return this.tabUseCase.close(true); + case operations.TAB_REOPEN: + return this.tabUseCase.reopen(); + case operations.TAB_PREV: + return this.tabSelectUseCase.selectPrev(1); + case operations.TAB_NEXT: + return this.tabSelectUseCase.selectNext(1); + case operations.TAB_FIRST: + return this.tabSelectUseCase.selectFirst(); + case operations.TAB_LAST: + return this.tabSelectUseCase.selectLast(); + case operations.TAB_PREV_SEL: + return this.tabSelectUseCase.selectPrevSelected(); + case operations.TAB_RELOAD: + return this.tabUseCase.reload(operation.cache); + case operations.TAB_PIN: + return this.tabUseCase.setPinned(true); + case operations.TAB_UNPIN: + return this.tabUseCase.setPinned(false); + case operations.TAB_TOGGLE_PINNED: + return this.tabUseCase.togglePinned(); + case operations.TAB_DUPLICATE: + return this.tabUseCase.duplicate(); + case operations.PAGE_SOURCE: + return this.tabUseCase.openPageSource(); + case operations.PAGE_HOME: + return this.tabUseCase.openHome(operation.newTab); + case operations.ZOOM_IN: + return this.zoomUseCase.zoomIn(); + case operations.ZOOM_OUT: + return this.zoomUseCase.zoomOut(); + case operations.ZOOM_NEUTRAL: + return this.zoomUseCase.zoomNutoral(); + case operations.COMMAND_SHOW: + return this.consoleUseCase.showCommand(); + case operations.COMMAND_SHOW_OPEN: + return this.consoleUseCase.showOpenCommand(operation.alter); + case operations.COMMAND_SHOW_TABOPEN: + return this.consoleUseCase.showTabopenCommand(operation.alter); + case operations.COMMAND_SHOW_WINOPEN: + return this.consoleUseCase.showWinopenCommand(operation.alter); + case operations.COMMAND_SHOW_BUFFER: + return this.consoleUseCase.showBufferCommand(); + case operations.COMMAND_SHOW_ADDBOOKMARK: + return this.consoleUseCase.showAddbookmarkCommand(operation.alter); + case operations.FIND_START: + return this.findUseCase.findStart(); + case operations.CANCEL: + return this.consoleUseCase.hideConsole(); + } + } +} + diff --git a/src/background/controllers/SettingController.js b/src/background/controllers/SettingController.js deleted file mode 100644 index e895d72..0000000 --- a/src/background/controllers/SettingController.js +++ /dev/null @@ -1,18 +0,0 @@ -import SettingUseCase from '../usecases/SettingUseCase'; -import ContentMessageClient from '../infrastructures/ContentMessageClient'; - -export default class SettingController { - constructor() { - this.settingUseCase = new SettingUseCase(); - this.contentMessageClient = new ContentMessageClient(); - } - - getSetting() { - return this.settingUseCase.get(); - } - - async reload() { - await this.settingUseCase.reload(); - this.contentMessageClient.broadcastSettingsChanged(); - } -} diff --git a/src/background/controllers/SettingController.ts b/src/background/controllers/SettingController.ts new file mode 100644 index 0000000..e895d72 --- /dev/null +++ b/src/background/controllers/SettingController.ts @@ -0,0 +1,18 @@ +import SettingUseCase from '../usecases/SettingUseCase'; +import ContentMessageClient from '../infrastructures/ContentMessageClient'; + +export default class SettingController { + constructor() { + this.settingUseCase = new SettingUseCase(); + this.contentMessageClient = new ContentMessageClient(); + } + + getSetting() { + return this.settingUseCase.get(); + } + + async reload() { + await this.settingUseCase.reload(); + this.contentMessageClient.broadcastSettingsChanged(); + } +} diff --git a/src/background/controllers/VersionController.js b/src/background/controllers/VersionController.js deleted file mode 100644 index c596f9b..0000000 --- a/src/background/controllers/VersionController.js +++ /dev/null @@ -1,11 +0,0 @@ -import VersionUseCase from '../usecases/VersionUseCase'; - -export default class VersionController { - constructor() { - this.versionUseCase = new VersionUseCase(); - } - - notify() { - this.versionUseCase.notify(); - } -} diff --git a/src/background/controllers/VersionController.ts b/src/background/controllers/VersionController.ts new file mode 100644 index 0000000..c596f9b --- /dev/null +++ b/src/background/controllers/VersionController.ts @@ -0,0 +1,11 @@ +import VersionUseCase from '../usecases/VersionUseCase'; + +export default class VersionController { + constructor() { + this.versionUseCase = new VersionUseCase(); + } + + notify() { + this.versionUseCase.notify(); + } +} diff --git a/src/background/controllers/version.js b/src/background/controllers/version.js deleted file mode 100644 index ec0f634..0000000 --- a/src/background/controllers/version.js +++ /dev/null @@ -1,13 +0,0 @@ -import VersionInteractor from '../usecases/version'; - -export default class VersionController { - constructor() { - this.versionInteractor = new VersionInteractor(); - } - - notifyIfUpdated() { - browser.runtime.onInstalled.addListener(() => { - return this.versionInteractor.notify(); - }); - } -} diff --git a/src/background/controllers/version.ts b/src/background/controllers/version.ts new file mode 100644 index 0000000..ec0f634 --- /dev/null +++ b/src/background/controllers/version.ts @@ -0,0 +1,13 @@ +import VersionInteractor from '../usecases/version'; + +export default class VersionController { + constructor() { + this.versionInteractor = new VersionInteractor(); + } + + notifyIfUpdated() { + browser.runtime.onInstalled.addListener(() => { + return this.versionInteractor.notify(); + }); + } +} -- cgit v1.2.3