Capitalize background scripts

jh-changes
Shin'ya Ueoka 5 years ago
parent 21788740c1
commit a26d8a8a1b
  1. 11
      src/background/controllers/AddonEnabledController.js
  2. 22
      src/background/controllers/CommandController.js
  3. 15
      src/background/controllers/FindController.js
  4. 15
      src/background/controllers/LinkController.js
  5. 15
      src/background/controllers/MarkController.js
  6. 69
      src/background/controllers/OperationController.js
  7. 18
      src/background/controllers/SettingController.js
  8. 11
      src/background/controllers/VersionController.js
  9. 11
      src/background/controllers/addon-enabled.js
  10. 15
      src/background/controllers/find.js
  11. 15
      src/background/controllers/link.js
  12. 15
      src/background/controllers/mark.js
  13. 69
      src/background/controllers/operation.js
  14. 18
      src/background/controllers/setting.js
  15. 11
      src/background/controllers/version.js
  16. 0
      src/background/domains/CommandDocs.js
  17. 0
      src/background/domains/CompletionGroup.js
  18. 0
      src/background/domains/CompletionItem.js
  19. 0
      src/background/domains/Completions.js
  20. 0
      src/background/domains/GlobalMark.js
  21. 0
      src/background/domains/Setting.js
  22. 6
      src/background/index.js
  23. 3
      src/background/infrastructures/ConsoleClient.js
  24. 0
      src/background/infrastructures/ContentMessageClient.js
  25. 14
      src/background/infrastructures/ContentMessageListener.js
  26. 0
      src/background/infrastructures/MemoryStorage.js
  27. 0
      src/background/infrastructures/Notifier.js
  28. 0
      src/background/presenters/IndicatorPresenter.js
  29. 2
      src/background/presenters/TabPresenter.js
  30. 0
      src/background/presenters/WindowPresenter.js
  31. 0
      src/background/repositories/BookmarkRepository.js
  32. 0
      src/background/repositories/CompletionsRepository.js
  33. 2
      src/background/repositories/FindRepository.js
  34. 4
      src/background/repositories/MarkRepository.js
  35. 2
      src/background/repositories/PersistentSettingRepository.js
  36. 2
      src/background/repositories/SettingRepository.js
  37. 0
      src/background/repositories/VersionRepository.js
  38. 8
      src/background/usecases/AddonEnabledUseCase.js
  39. 16
      src/background/usecases/CommandUseCase.js
  40. 26
      src/background/usecases/CompletionsUseCase.js
  41. 4
      src/background/usecases/FindUseCase.js
  42. 6
      src/background/usecases/LinkUseCase.js
  43. 16
      src/background/usecases/MarkUseCase.js
  44. 24
      src/background/usecases/OperationUseCase.js
  45. 9
      src/background/usecases/SettingUseCase.js
  46. 8
      src/background/usecases/VersionUseCase.js
  47. 2
      test/background/domains/GlobalMark.test.js
  48. 2
      test/background/infrastructures/MemoryStorage.test.js
  49. 4
      test/background/repositories/Mark.test.js
  50. 2
      test/background/repositories/Version.js

@ -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);
}
}

@ -1,6 +1,6 @@
import CompletionsInteractor from '../usecases/completions';
import CommandInteractor from '../usecases/command';
import Completions from '../domains/completions';
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
@ -9,8 +9,8 @@ const trimStart = (str) => {
export default class CommandController {
constructor() {
this.completionsInteractor = new CompletionsInteractor();
this.commandIndicator = new CommandInteractor();
this.completionsUseCase = new CompletionsUseCase();
this.commandIndicator = new CommandUseCase();
}
getCompletions(line) {
@ -18,7 +18,7 @@ export default class CommandController {
let words = trimmed.split(/ +/);
let name = words[0];
if (words.length === 1) {
return this.completionsInteractor.queryConsoleCommand(name);
return this.completionsUseCase.queryConsoleCommand(name);
}
let keywords = trimStart(trimmed.slice(name.length));
switch (words[0]) {
@ -28,22 +28,22 @@ export default class CommandController {
case 'tabopen':
case 'w':
case 'winopen':
return this.completionsInteractor.queryOpen(name, keywords);
return this.completionsUseCase.queryOpen(name, keywords);
case 'b':
case 'buffer':
return this.completionsInteractor.queryBuffer(name, keywords);
return this.completionsUseCase.queryBuffer(name, keywords);
case 'bd':
case 'bdel':
case 'bdelete':
case 'bdeletes':
return this.completionsInteractor.queryBdelete(name, keywords);
return this.completionsUseCase.queryBdelete(name, keywords);
case 'bd!':
case 'bdel!':
case 'bdelete!':
case 'bdeletes!':
return this.completionsInteractor.queryBdeleteForce(name, keywords);
return this.completionsUseCase.queryBdeleteForce(name, keywords);
case 'set':
return this.completionsInteractor.querySet(name, keywords);
return this.completionsUseCase.querySet(name, keywords);
}
return Promise.resolve(Completions.empty());
}

@ -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);
}
}

@ -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);
}
}

@ -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);
}
}

@ -0,0 +1,69 @@
import operations from '../../shared/operations';
import OperationUseCase from '../usecases/OperationUseCase';
export default class OperationController {
constructor() {
this.operationUseCase = new OperationUseCase();
}
// eslint-disable-next-line complexity, max-lines-per-function
exec(operation) {
switch (operation.type) {
case operations.TAB_CLOSE:
return this.operationUseCase.close(false);
case operations.TAB_CLOSE_RIGHT:
return this.operationUseCase.closeRight();
case operations.TAB_CLOSE_FORCE:
return this.operationUseCase.close(true);
case operations.TAB_REOPEN:
return this.operationUseCase.reopen();
case operations.TAB_PREV:
return this.operationUseCase.selectPrev(1);
case operations.TAB_NEXT:
return this.operationUseCase.selectNext(1);
case operations.TAB_FIRST:
return this.operationUseCase.selectFirst();
case operations.TAB_LAST:
return this.operationUseCase.selectLast();
case operations.TAB_PREV_SEL:
return this.operationUseCase.selectPrevSelected();
case operations.TAB_RELOAD:
return this.operationUseCase.reload(operation.cache);
case operations.TAB_PIN:
return this.operationUseCase.setPinned(true);
case operations.TAB_UNPIN:
return this.operationUseCase.setPinned(false);
case operations.TAB_TOGGLE_PINNED:
return this.operationUseCase.togglePinned();
case operations.TAB_DUPLICATE:
return this.operationUseCase.duplicate();
case operations.PAGE_SOURCE:
return this.operationUseCase.openPageSource();
case operations.PAGE_HOME:
return this.operationUseCase.openHome(operation.newTab);
case operations.ZOOM_IN:
return this.operationUseCase.zoomIn();
case operations.ZOOM_OUT:
return this.operationUseCase.zoomOut();
case operations.ZOOM_NEUTRAL:
return this.operationUseCase.zoomNutoral();
case operations.COMMAND_SHOW:
return this.operationUseCase.showCommand();
case operations.COMMAND_SHOW_OPEN:
return this.operationUseCase.showOpenCommand(operation.alter);
case operations.COMMAND_SHOW_TABOPEN:
return this.operationUseCase.showTabopenCommand(operation.alter);
case operations.COMMAND_SHOW_WINOPEN:
return this.operationUseCase.showWinopenCommand(operation.alter);
case operations.COMMAND_SHOW_BUFFER:
return this.operationUseCase.showBufferCommand();
case operations.COMMAND_SHOW_ADDBOOKMARK:
return this.operationUseCase.showAddbookmarkCommand(operation.alter);
case operations.FIND_START:
return this.operationUseCase.findStart();
case operations.CANCEL:
return this.operationUseCase.hideConsole();
}
}
}

@ -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();
}
}

@ -0,0 +1,11 @@
import VersionUseCase from '../usecases/VersionUseCase';
export default class VersionController {
constructor() {
this.versionUseCase = new VersionUseCase();
}
notifyIfUpdated() {
this.versionUseCase.notifyIfUpdated();
}
}

@ -1,11 +0,0 @@
import AddonEnabledInteractor from '../usecases/addon-enabled';
export default class AddonEnabledController {
constructor() {
this.addonEnabledInteractor = new AddonEnabledInteractor();
}
indicate(enabled) {
return this.addonEnabledInteractor.indicate(enabled);
}
}

@ -1,15 +0,0 @@
import FindInteractor from '../usecases/find';
export default class FindController {
constructor() {
this.findInteractor = new FindInteractor();
}
getKeyword() {
return this.findInteractor.getKeyword();
}
setKeyword(keyword) {
return this.findInteractor.setKeyword(keyword);
}
}

@ -1,15 +0,0 @@
import LinkInteractor from '../usecases/link';
export default class LinkController {
constructor() {
this.linkInteractor = new LinkInteractor();
}
openToTab(url, tabId) {
this.linkInteractor.openToTab(url, tabId);
}
openNewTab(url, openerId, background) {
this.linkInteractor.openNewTab(url, openerId, background);
}
}

@ -1,15 +0,0 @@
import MarkInteractor from '../usecases/mark';
export default class MarkController {
constructor() {
this.markInteractor = new MarkInteractor();
}
setGlobal(key, x, y) {
this.markInteractor.setGlobal(key, x, y);
}
jumpGlobal(key) {
this.markInteractor.jumpGlobal(key);
}
}

@ -1,69 +0,0 @@
import operations from '../../shared/operations';
import OperationInteractor from '../usecases/operation';
export default class OperationController {
constructor() {
this.operationInteractor = new OperationInteractor();
}
// eslint-disable-next-line complexity, max-lines-per-function
exec(operation) {
switch (operation.type) {
case operations.TAB_CLOSE:
return this.operationInteractor.close(false);
case operations.TAB_CLOSE_RIGHT:
return this.operationInteractor.closeRight();
case operations.TAB_CLOSE_FORCE:
return this.operationInteractor.close(true);
case operations.TAB_REOPEN:
return this.operationInteractor.reopen();
case operations.TAB_PREV:
return this.operationInteractor.selectPrev(1);
case operations.TAB_NEXT:
return this.operationInteractor.selectNext(1);
case operations.TAB_FIRST:
return this.operationInteractor.selectFirst();
case operations.TAB_LAST:
return this.operationInteractor.selectLast();
case operations.TAB_PREV_SEL:
return this.operationInteractor.selectPrevSelected();
case operations.TAB_RELOAD:
return this.operationInteractor.reload(operation.cache);
case operations.TAB_PIN:
return this.operationInteractor.setPinned(true);
case operations.TAB_UNPIN:
return this.operationInteractor.setPinned(false);
case operations.TAB_TOGGLE_PINNED:
return this.operationInteractor.togglePinned();
case operations.TAB_DUPLICATE:
return this.operationInteractor.duplicate();
case operations.PAGE_SOURCE:
return this.operationInteractor.openPageSource();
case operations.PAGE_HOME:
return this.operationInteractor.openHome(operation.newTab);
case operations.ZOOM_IN:
return this.operationInteractor.zoomIn();
case operations.ZOOM_OUT:
return this.operationInteractor.zoomOut();
case operations.ZOOM_NEUTRAL:
return this.operationInteractor.zoomNutoral();
case operations.COMMAND_SHOW:
return this.operationInteractor.showCommand();
case operations.COMMAND_SHOW_OPEN:
return this.operationInteractor.showOpenCommand(operation.alter);
case operations.COMMAND_SHOW_TABOPEN:
return this.operationInteractor.showTabopenCommand(operation.alter);
case operations.COMMAND_SHOW_WINOPEN:
return this.operationInteractor.showWinopenCommand(operation.alter);
case operations.COMMAND_SHOW_BUFFER:
return this.operationInteractor.showBufferCommand();
case operations.COMMAND_SHOW_ADDBOOKMARK:
return this.operationInteractor.showAddbookmarkCommand(operation.alter);
case operations.FIND_START:
return this.operationInteractor.findStart();
case operations.CANCEL:
return this.operationInteractor.hideConsole();
}
}
}

@ -1,18 +0,0 @@
import SettingInteractor from '../usecases/setting';
import ContentMessageClient from '../infrastructures/content-message-client';
export default class SettingController {
constructor() {
this.settingInteractor = new SettingInteractor();
this.contentMessageClient = new ContentMessageClient();
}
getSetting() {
return this.settingInteractor.get();
}
async reload() {
await this.settingInteractor.reload();
this.contentMessageClient.broadcastSettingsChanged();
}
}

@ -1,11 +0,0 @@
import VersionInteractor from '../usecases/version';
export default class VersionController {
constructor() {
this.versionInteractor = new VersionInteractor();
}
notifyIfUpdated() {
this.versionInteractor.notifyIfUpdated();
}
}

@ -1,6 +1,6 @@
import ContentMessageListener from './infrastructures/content-message-listener';
import SettingController from './controllers/setting';
import VersionController from './controllers/version';
import ContentMessageListener from './infrastructures/ContentMessageListener';
import SettingController from './controllers/SettingController';
import VersionController from './controllers/VersionController';
new SettingController().reload();
new VersionController().notifyIfUpdated();

@ -1,6 +1,6 @@
import messages from '../../shared/messages';
export default class ConsolePresenter {
export default class ConsoleClient {
showCommand(tabId, command) {
return browser.tabs.sendMessage(tabId, {
type: messages.CONSOLE_SHOW_COMMAND,
@ -34,3 +34,4 @@ export default class ConsolePresenter {
});
}
}

@ -1,11 +1,11 @@
import messages from '../../shared/messages';
import CommandController from '../controllers/command';
import SettingController from '../controllers/setting';
import FindController from '../controllers/find';
import AddonEnabledController from '../controllers/addon-enabled';
import LinkController from '../controllers/link';
import OperationController from '../controllers/operation';
import MarkController from '../controllers/mark';
import CommandController from '../controllers/CommandController';
import SettingController from '../controllers/SettingController';
import FindController from '../controllers/FindController';
import AddonEnabledController from '../controllers/AddonEnabledController';
import LinkController from '../controllers/LinkController';
import OperationController from '../controllers/OperationController';
import MarkController from '../controllers/MarkController';
export default class ContentMessageListener {
constructor() {

@ -1,4 +1,4 @@
import MemoryStorage from '../infrastructures/memory-storage';
import MemoryStorage from '../infrastructures/MemoryStorage';
const CURRENT_SELECTED_KEY = 'tabs.current.selected';
const LAST_SELECTED_KEY = 'tabs.last.selected';

@ -1,4 +1,4 @@
import MemoryStorage from '../infrastructures/memory-storage';
import MemoryStorage from '../infrastructures/MemoryStorage';
const FIND_KEYWORD_KEY = 'find-keyword';

@ -1,5 +1,5 @@
import MemoryStorage from '../infrastructures/memory-storage';
import GlobalMark from 'background/domains/global-mark';
import MemoryStorage from '../infrastructures/MemoryStorage';
import GlobalMark from '../domains/GlobalMark';
const MARK_KEY = 'mark';

@ -1,4 +1,4 @@
import Setting from '../domains/setting';
import Setting from '../domains/Setting';
export default class SettingRepository {
save(settings) {

@ -1,4 +1,4 @@
import MemoryStorage from '../infrastructures/memory-storage';
import MemoryStorage from '../infrastructures/MemoryStorage';
const CACHED_SETTING_KEY = 'setting';

@ -1,8 +1,8 @@
import IndicatorPresenter from '../presenters/indicator';
import TabPresenter from '../presenters/tab';
import ContentMessageClient from '../infrastructures/content-message-client';
import IndicatorPresenter from '../presenters/IndicatorPresenter';
import TabPresenter from '../presenters/TabPresenter';
import ContentMessageClient from '../infrastructures/ContentMessageClient';
export default class AddonEnabledInteractor {
export default class AddonEnabledUseCase {
constructor() {
this.indicatorPresentor = new IndicatorPresenter();

@ -1,11 +1,11 @@
import * as parsers from './parsers';
import * as urls from '../../shared/urls';
import TabPresenter from '../presenters/tab';
import WindowPresenter from '../presenters/window';
import SettingRepository from '../repositories/setting';
import BookmarkRepository from '../repositories/bookmark';
import ConsolePresenter from '../presenters/console';
import ContentMessageClient from '../infrastructures/content-message-client';
import TabPresenter from '../presenters/TabPresenter';
import WindowPresenter from '../presenters/WindowPresenter';
import SettingRepository from '../repositories/SettingRepository';
import BookmarkRepository from '../repositories/BookmarkRepository';
import ConsoleClient from '../infrastructures/ConsoleClient';
import ContentMessageClient from '../infrastructures/ContentMessageClient';
import * as properties from 'shared/settings/properties';
export default class CommandIndicator {
@ -14,7 +14,7 @@ export default class CommandIndicator {
this.windowPresenter = new WindowPresenter();
this.settingRepository = new SettingRepository();
this.bookmarkRepository = new BookmarkRepository();
this.consolePresenter = new ConsolePresenter();
this.consoleClient = new ConsoleClient();
this.contentMessageClient = new ContentMessageClient();
}
@ -105,7 +105,7 @@ export default class CommandIndicator {
let tab = await this.tabPresenter.getCurrent();
let item = await this.bookmarkRepository.create(title, tab.url);
let message = 'Saved current page: ' + item.url;
return this.consolePresenter.showInfo(tab.id, message);
return this.consoleClient.showInfo(tab.id, message);
}
async set(keywords) {

@ -1,19 +1,19 @@
import CompletionItem from '../domains/completion-item';
import CompletionGroup from '../domains/completion-group';
import Completions from '../domains/completions';
import CommandDocs from '../domains/command-docs';
import CompletionRepository from '../repositories/completions';
import CompletionItem from '../domains/CompletionItem';
import CompletionGroup from '../domains/CompletionGroup';
import Completions from '../domains/Completions';
import CommandDocs from '../domains/CommandDocs';
import CompletionsRepository from '../repositories/CompletionsRepository';
import * as filters from './filters';
import SettingRepository from '../repositories/setting';
import TabPresenter from '../presenters/tab';
import SettingRepository from '../repositories/SettingRepository';
import TabPresenter from '../presenters/TabPresenter';
import * as properties from '../../shared/settings/properties';
const COMPLETION_ITEM_LIMIT = 10;
export default class CompletionsInteractor {
export default class CompletionsUseCase {
constructor() {
this.tabPresenter = new TabPresenter();
this.completionRepository = new CompletionRepository();
this.completionsRepository = new CompletionsRepository();
this.settingRepository = new SettingRepository();
}
@ -86,7 +86,7 @@ export default class CompletionsInteractor {
tabs = [tab];
}
} else {
tabs = await this.completionRepository.queryTabs(keywords, false);
tabs = await this.completionsRepository.queryTabs(keywords, false);
}
const flag = (tab) => {
if (tab.active) {
@ -153,7 +153,7 @@ export default class CompletionsInteractor {
}
async queryTabs(name, excludePinned, args) {
let tabs = await this.completionRepository.queryTabs(args, excludePinned);
let tabs = await this.completionsRepository.queryTabs(args, excludePinned);
let items = tabs.map(tab => new CompletionItem({
caption: tab.title,
content: name + ' ' + tab.title,
@ -177,7 +177,7 @@ export default class CompletionsInteractor {
}
async queryHistoryItems(name, keywords) {
let histories = await this.completionRepository.queryHistories(keywords);
let histories = await this.completionsRepository.queryHistories(keywords);
histories = [histories]
.map(filters.filterBlankTitle)
.map(filters.filterHttp)
@ -194,7 +194,7 @@ export default class CompletionsInteractor {
}
async queryBookmarkItems(name, keywords) {
let bookmarks = await this.completionRepository.queryBookmarks(keywords);
let bookmarks = await this.completionsRepository.queryBookmarks(keywords);
return bookmarks.slice(0, COMPLETION_ITEM_LIMIT)
.map(page => new CompletionItem({
caption: page.title,

@ -1,6 +1,6 @@
import FindRepository from '../repositories/find';
import FindRepository from '../repositories/FindRepository';
export default class FindInteractor {
export default class FindUseCase {
constructor() {
this.findRepository = new FindRepository();
}

@ -1,7 +1,7 @@
import SettingRepository from '../repositories/setting';
import TabPresenter from '../presenters/tab';
import SettingRepository from '../repositories/SettingRepository';
import TabPresenter from '../presenters/TabPresenter';
export default class LinkInteractor {
export default class LinkUseCase {
constructor() {
this.settingRepository = new SettingRepository();
this.tabPresenter = new TabPresenter();

@ -1,14 +1,14 @@
import GlobalMark from '../domains/global-mark';
import TabPresenter from '../presenters/tab';
import MarkRepository from '../repositories/mark';
import ConsolePresenter from '../presenters/console';
import ContentMessageClient from '../infrastructures/content-message-client';
import GlobalMark from '../domains/GlobalMark';
import TabPresenter from '../presenters/TabPresenter';
import MarkRepository from '../repositories/MarkRepository';
import ConsoleClient from '../infrastructures/ConsoleClient';
import ContentMessageClient from '../infrastructures/ContentMessageClient';
export default class MarkInteractor {
export default class MarkUseCase {
constructor() {
this.tabPresenter = new TabPresenter();
this.markRepository = new MarkRepository();
this.consolePresenter = new ConsolePresenter();
this.consoleClient = new ConsoleClient();
this.contentMessageClient = new ContentMessageClient();
}
@ -23,7 +23,7 @@ export default class MarkInteractor {
let mark = await this.markRepository.getMark(key);
if (!mark) {
return this.consolePresenter.showError(current.id, 'Mark is not set');
return this.consoleClient.showError(current.id, 'Mark is not set');
}
return this.contentMessageClient.scrollTo(

@ -1,5 +1,5 @@
import TabPresenter from '../presenters/tab';
import ConsolePresenter from '../presenters/console';
import TabPresenter from '../presenters/TabPresenter';
import ConsoleClient from '../infrastructures/ConsoleClient';
import * as urls from '../../shared/urls';
const ZOOM_SETTINGS = [
@ -7,10 +7,10 @@ const ZOOM_SETTINGS = [
1.10, 1.25, 1.50, 1.75, 2.00, 2.50, 3.00
];
export default class OperationInteractor {
export default class OperationUseCase {
constructor() {
this.tabPresenter = new TabPresenter();
this.consolePresenter = new ConsolePresenter();
this.consoleClient = new ConsoleClient();
}
async close(force) {
@ -134,7 +134,7 @@ export default class OperationInteractor {
async showCommand() {
let tab = await this.tabPresenter.getCurrent();
return this.consolePresenter.showCommand(tab.id, '');
return this.consoleClient.showCommand(tab.id, '');
}
async showOpenCommand(alter) {
@ -143,7 +143,7 @@ export default class OperationInteractor {
if (alter) {
command += tab.url;
}
return this.consolePresenter.showCommand(tab.id, command);
return this.consoleClient.showCommand(tab.id, command);
}
async showTabopenCommand(alter) {
@ -152,7 +152,7 @@ export default class OperationInteractor {
if (alter) {
command += tab.url;
}
return this.consolePresenter.showCommand(tab.id, command);
return this.consoleClient.showCommand(tab.id, command);
}
async showWinopenCommand(alter) {
@ -161,13 +161,13 @@ export default class OperationInteractor {
if (alter) {
command += tab.url;
}
return this.consolePresenter.showCommand(tab.id, command);
return this.consoleClient.showCommand(tab.id, command);
}
async showBufferCommand() {
let tab = await this.tabPresenter.getCurrent();
let command = 'buffer ';
return this.consolePresenter.showCommand(tab.id, command);
return this.consoleClient.showCommand(tab.id, command);
}
async showAddbookmarkCommand(alter) {
@ -176,17 +176,17 @@ export default class OperationInteractor {
if (alter) {
command += tab.title;
}
return this.consolePresenter.showCommand(tab.id, command);
return this.consoleClient.showCommand(tab.id, command);
}
async findStart() {
let tab = await this.tabPresenter.getCurrent();
return this.consolePresenter.showFind(tab.id);
return this.consoleClient.showFind(tab.id);
}
async hideConsole() {
let tab = await this.tabPresenter.getCurrent();
return this.consolePresenter.hide(tab.id);
return this.consoleClient.hide(tab.id);
}
async openHome(newTab) {

@ -1,8 +1,9 @@
import Setting from '../domains/setting';
import PersistentSettingRepository from '../repositories/persistent-setting';
import SettingRepository from '../repositories/setting';
import Setting from '../domains/Setting';
// eslint-disable-next-line max-len
import PersistentSettingRepository from '../repositories/PersistentSettingRepository';
import SettingRepository from '../repositories/SettingRepository';
export default class SettingInteractor {
export default class SettingUseCase {
constructor() {
this.persistentSettingRepository = new PersistentSettingRepository();
this.settingRepository = new SettingRepository();

@ -1,9 +1,9 @@
import manifest from '../../../manifest.json';
import VersionRepository from '../repositories/version';
import TabPresenter from '../presenters/tab';
import Notifier from '../infrastructures/notifier';
import VersionRepository from '../repositories/VersionRepository';
import TabPresenter from '../presenters/TabPresenter';
import Notifier from '../infrastructures/Notifier';
export default class VersionInteractor {
export default class VersionUseCase {
constructor() {
this.versionRepository = new VersionRepository();
this.tabPresenter = new TabPresenter();

@ -1,4 +1,4 @@
import GlobalMark from 'background/domains/global-mark';
import GlobalMark from 'background/domains/GlobalMark';
describe('background/domains/global-mark', () => {
describe('constructor and getter', () => {

@ -1,4 +1,4 @@
import MemoryStorage from 'background/infrastructures/memory-storage';
import MemoryStorage from 'background/infrastructures/MemoryStorage';
describe("background/infrastructures/memory-storage", () => {
it('stores values', () => {

@ -1,5 +1,5 @@
import MarkRepository from 'background/repositories/mark';
import GlobalMark from 'background/domains/global-mark';
import MarkRepository from 'background/repositories/MarkRepository';
import GlobalMark from 'background/domains/GlobalMark';
describe('background/repositories/mark', () => {
let repository;

@ -1,4 +1,4 @@
import VersionRepository from 'background/repositories/version';
import VersionRepository from 'background/repositories/Version';
describe("background/repositories/version", () => {
let versionRepository;