From 76d3d74d305f372449b7eaa526030f1554e219f2 Mon Sep 17 00:00:00 2001 From: takker99 <37929109+takker99@users.noreply.github.com> Date: Wed, 16 Feb 2022 16:14:10 +0900 Subject: [PATCH] :art: Separate type effect of websocket from browser/dom/mod.ts --- browser/{ => dom}/caret.ts | 0 browser/{ => dom}/click.ts | 2 +- browser/{ => dom}/dom.ts | 0 browser/{ => dom}/edit.ts | 6 +++--- browser/{ => dom}/ensure.ts | 0 browser/{ => dom}/isHeightViewable.ts | 0 browser/dom/mod.ts | 9 +++++++++ browser/{ => dom}/motion.ts | 2 +- browser/{ => dom}/node.ts | 8 ++++---- browser/{ => dom}/openInTheSameTab.ts | 2 +- browser/{ => dom}/press.ts | 0 browser/{ => dom}/statusBar.ts | 0 browser/mod.ts | 14 ++------------ browser/websocket/mod.ts | 3 +++ 14 files changed, 24 insertions(+), 22 deletions(-) rename browser/{ => dom}/caret.ts (100%) rename browser/{ => dom}/click.ts (98%) rename browser/{ => dom}/dom.ts (100%) rename browser/{ => dom}/edit.ts (96%) rename browser/{ => dom}/ensure.ts (100%) rename browser/{ => dom}/isHeightViewable.ts (100%) create mode 100644 browser/dom/mod.ts rename browser/{ => dom}/motion.ts (99%) rename browser/{ => dom}/node.ts (97%) rename browser/{ => dom}/openInTheSameTab.ts (93%) rename browser/{ => dom}/press.ts (100%) rename browser/{ => dom}/statusBar.ts (100%) create mode 100644 browser/websocket/mod.ts diff --git a/browser/caret.ts b/browser/dom/caret.ts similarity index 100% rename from browser/caret.ts rename to browser/dom/caret.ts diff --git a/browser/click.ts b/browser/dom/click.ts similarity index 98% rename from browser/click.ts rename to browser/dom/click.ts index b0a1fb3..d6350ba 100644 --- a/browser/click.ts +++ b/browser/dom/click.ts @@ -2,7 +2,7 @@ /// /// -import { sleep } from "../sleep.ts"; +import { sleep } from "../../sleep.ts"; /** the options for `click()` */ export interface ClickOptions { diff --git a/browser/dom.ts b/browser/dom/dom.ts similarity index 100% rename from browser/dom.ts rename to browser/dom/dom.ts diff --git a/browser/edit.ts b/browser/dom/edit.ts similarity index 96% rename from browser/edit.ts rename to browser/dom/edit.ts index ffb743e..e423736 100644 --- a/browser/edit.ts +++ b/browser/dom/edit.ts @@ -1,10 +1,10 @@ import { goHead, goLine } from "./motion.ts"; import { press } from "./press.ts"; import { getLineCount } from "./node.ts"; -import { range } from "../range.ts"; +import { range } from "../../range.ts"; import { textInput } from "./dom.ts"; -import { isArray, isNumber, isString } from "../is.ts"; -import { sleep } from "../sleep.ts"; +import { isArray, isNumber, isString } from "../../is.ts"; +import { sleep } from "../../sleep.ts"; export function undo(count = 1) { for (const _ of range(0, count)) { diff --git a/browser/ensure.ts b/browser/dom/ensure.ts similarity index 100% rename from browser/ensure.ts rename to browser/dom/ensure.ts diff --git a/browser/isHeightViewable.ts b/browser/dom/isHeightViewable.ts similarity index 100% rename from browser/isHeightViewable.ts rename to browser/dom/isHeightViewable.ts diff --git a/browser/dom/mod.ts b/browser/dom/mod.ts new file mode 100644 index 0000000..659b854 --- /dev/null +++ b/browser/dom/mod.ts @@ -0,0 +1,9 @@ +export * from "./node.ts"; +export * from "./motion.ts"; +export * from "./edit.ts"; +export * from "./press.ts"; +export * from "./click.ts"; +export * from "./statusBar.ts"; +export * from "./caret.ts"; +export * from "./dom.ts"; +export * from "./openInTheSameTab.ts"; diff --git a/browser/motion.ts b/browser/dom/motion.ts similarity index 99% rename from browser/motion.ts rename to browser/dom/motion.ts index 4e821b5..2ffc2de 100644 --- a/browser/motion.ts +++ b/browser/dom/motion.ts @@ -16,7 +16,7 @@ import { } from "./node.ts"; import { caret } from "./caret.ts"; import { isHeightViewable } from "./isHeightViewable.ts"; -import { range } from "../range.ts"; +import { range } from "../../range.ts"; /** カーソル行の行末を長押ししてfocusを得る * diff --git a/browser/node.ts b/browser/dom/node.ts similarity index 97% rename from browser/node.ts rename to browser/dom/node.ts index 6aab2ac..0897057 100644 --- a/browser/node.ts +++ b/browser/dom/node.ts @@ -1,11 +1,11 @@ /// /// /// -import { isNone, isNumber, isString } from "../is.ts"; -import { ensureArray } from "../ensure.ts"; -import type { Scrapbox } from "../deps/scrapbox.ts"; +import { isNone, isNumber, isString } from "../../is.ts"; +import { ensureArray } from "../../ensure.ts"; +import type { Scrapbox } from "../../deps/scrapbox.ts"; import { lines } from "./dom.ts"; -import * as Text from "../text.ts"; +import * as Text from "../../text.ts"; declare const scrapbox: Scrapbox; /** Get the line id from value diff --git a/browser/openInTheSameTab.ts b/browser/dom/openInTheSameTab.ts similarity index 93% rename from browser/openInTheSameTab.ts rename to browser/dom/openInTheSameTab.ts index 06f6f78..aafc163 100644 --- a/browser/openInTheSameTab.ts +++ b/browser/dom/openInTheSameTab.ts @@ -1,7 +1,7 @@ /// /// /// -import { encodeTitleURI } from "../title.ts"; +import { encodeTitleURI } from "../../title.ts"; /** 同じタブでページを開く * diff --git a/browser/press.ts b/browser/dom/press.ts similarity index 100% rename from browser/press.ts rename to browser/dom/press.ts diff --git a/browser/statusBar.ts b/browser/dom/statusBar.ts similarity index 100% rename from browser/statusBar.ts rename to browser/dom/statusBar.ts diff --git a/browser/mod.ts b/browser/mod.ts index dd04d55..c06bf68 100644 --- a/browser/mod.ts +++ b/browser/mod.ts @@ -1,12 +1,2 @@ -export * from "./node.ts"; -export * from "./motion.ts"; -export * from "./edit.ts"; -export * from "./press.ts"; -export * from "./click.ts"; -export * from "./statusBar.ts"; -export * from "./caret.ts"; -export * from "./dom.ts"; -export * from "./openInTheSameTab.ts"; -export * from "./websocket/room.ts"; -export * from "./websocket/shortcuts.ts"; -export * from "./websocket/stream.ts"; +export * from "./dom/mod.ts"; +export * from "./websocket/mod.ts"; diff --git a/browser/websocket/mod.ts b/browser/websocket/mod.ts new file mode 100644 index 0000000..7959b96 --- /dev/null +++ b/browser/websocket/mod.ts @@ -0,0 +1,3 @@ +export * from "./room.ts"; +export * from "./shortcuts.ts"; +export * from "./stream.ts";