From 6f1be248fb8c962bc6866b842b11f14403a8b6aa Mon Sep 17 00:00:00 2001 From: Simon Chan <1330321+yume-chan@users.noreply.github.com> Date: Thu, 23 Feb 2023 15:59:32 +0800 Subject: [PATCH] chore: prefer top-level type import Prepare for TypeScript 5.0 verbatimModuleSyntax option --- .../adb-backend-direct-sockets/src/index.ts | 10 ++----- libraries/adb-backend-webusb/src/backend.ts | 17 ++++------- libraries/adb-backend-ws/src/index.ts | 7 ++--- libraries/adb-credential-web/src/index.ts | 2 +- libraries/adb/src/adb.ts | 24 +++++++-------- libraries/adb/src/auth.ts | 7 +++-- libraries/adb/src/backend.ts | 6 ++-- libraries/adb/src/commands/base.ts | 2 +- libraries/adb/src/commands/framebuffer.ts | 2 +- libraries/adb/src/commands/install.ts | 10 +++---- libraries/adb/src/commands/reverse.ts | 7 ++--- .../adb/src/commands/subprocess/command.ts | 6 ++-- .../src/commands/subprocess/protocols/none.ts | 8 ++--- .../commands/subprocess/protocols/shell.ts | 19 +++++++----- .../commands/subprocess/protocols/types.ts | 11 +++---- libraries/adb/src/commands/sync/list.ts | 13 ++++---- libraries/adb/src/commands/sync/pull.ts | 8 ++--- libraries/adb/src/commands/sync/push.ts | 10 +++---- libraries/adb/src/commands/sync/request.ts | 2 +- libraries/adb/src/commands/sync/response.ts | 8 ++--- libraries/adb/src/commands/sync/stat.ts | 6 ++-- libraries/adb/src/commands/sync/sync.ts | 15 ++++++---- libraries/adb/src/socket/dispatcher.ts | 25 +++++++--------- libraries/adb/src/socket/socket.ts | 12 ++++---- libraries/adb/src/utils/auto-reset-event.ts | 2 +- .../adb/src/utils/conditional-variable.ts | 2 +- libraries/android-bin/src/bug-report.ts | 2 +- libraries/android-bin/src/demo-mode.ts | 3 +- libraries/android-bin/src/logcat.ts | 8 ++--- libraries/android-bin/src/overlay-display.ts | 3 +- libraries/b-tree/src/index.spec.ts | 3 +- libraries/event/src/disposable.spec.ts | 3 +- libraries/event/src/event-emitter.ts | 4 +-- libraries/event/src/event.ts | 2 +- libraries/event/src/utils.ts | 2 +- libraries/scrcpy/src/adb/client.ts | 30 +++++++++---------- libraries/scrcpy/src/adb/connection.ts | 17 ++++++----- libraries/scrcpy/src/adb/options/1_16.ts | 10 ++++--- libraries/scrcpy/src/adb/options/1_22.ts | 6 ++-- libraries/scrcpy/src/adb/options/types.ts | 20 ++++++------- .../scrcpy/src/control/back-or-screen-on.ts | 2 +- libraries/scrcpy/src/control/hover-helper.ts | 6 ++-- libraries/scrcpy/src/control/inject-scroll.ts | 2 +- libraries/scrcpy/src/control/serializer.ts | 28 ++++++++--------- libraries/scrcpy/src/control/set-clipboard.ts | 2 +- .../scrcpy/src/options/1_16/codec-options.ts | 7 ++--- libraries/scrcpy/src/options/1_16/options.ts | 19 +++++------- libraries/scrcpy/src/options/1_16/scroll.ts | 6 ++-- libraries/scrcpy/src/options/1_18.ts | 10 +++---- libraries/scrcpy/src/options/1_21.ts | 9 +++--- libraries/scrcpy/src/options/1_22/options.ts | 5 ++-- libraries/scrcpy/src/options/1_23.ts | 8 ++--- libraries/scrcpy/src/options/1_24.ts | 8 +++-- libraries/scrcpy/src/options/1_25/options.ts | 5 ++-- libraries/scrcpy/src/options/1_25/scroll.ts | 9 ++---- libraries/scrcpy/src/options/types.ts | 12 ++++---- .../stream-extra/src/buffered-transform.ts | 15 ++++------ libraries/stream-extra/src/buffered.ts | 5 +--- libraries/stream-extra/src/duplex.ts | 12 ++++---- libraries/stream-extra/src/pipe-from.ts | 13 ++++---- libraries/stream-extra/src/push-readable.ts | 8 ++--- libraries/stream-extra/src/stream.ts | 2 +- .../stream-extra/src/struct-deserialize.ts | 2 +- libraries/stream-extra/src/wrap-readable.ts | 10 +++---- libraries/stream-extra/src/wrap-writable.ts | 5 ++-- libraries/struct/src/basic/definition.spec.ts | 14 ++++----- libraries/struct/src/basic/definition.ts | 12 ++++---- .../struct/src/basic/field-value.spec.ts | 12 ++++---- libraries/struct/src/basic/field-value.ts | 6 ++-- libraries/struct/src/basic/stream.ts | 2 +- libraries/struct/src/basic/struct-value.ts | 2 +- libraries/struct/src/struct.spec.ts | 20 ++++++------- libraries/struct/src/struct.ts | 29 +++++++++--------- libraries/struct/src/types/bigint.ts | 15 +++++----- .../struct/src/types/buffer/base.spec.ts | 9 ++---- libraries/struct/src/types/buffer/base.ts | 16 +++++----- .../struct/src/types/buffer/fixed-length.ts | 3 +- .../src/types/buffer/variable-length.ts | 19 +++++------- libraries/struct/src/types/number.spec.ts | 7 ++--- libraries/struct/src/types/number.ts | 15 +++++----- toolchain/eslint-config/index.js | 4 +-- 81 files changed, 345 insertions(+), 404 deletions(-) diff --git a/libraries/adb-backend-direct-sockets/src/index.ts b/libraries/adb-backend-direct-sockets/src/index.ts index 2edcd7c4..f46cc9b1 100644 --- a/libraries/adb-backend-direct-sockets/src/index.ts +++ b/libraries/adb-backend-direct-sockets/src/index.ts @@ -1,15 +1,11 @@ -import { - AdbPacket, - AdbPacketSerializeStream, - type AdbBackend, -} from "@yume-chan/adb"; +import type { AdbBackend } from "@yume-chan/adb"; +import { AdbPacket, AdbPacketSerializeStream } from "@yume-chan/adb"; +import type { ReadableStream, WritableStream } from "@yume-chan/stream-extra"; import { StructDeserializeStream, WrapReadableStream, WrapWritableStream, pipeFrom, - type ReadableStream, - type WritableStream, } from "@yume-chan/stream-extra"; declare global { diff --git a/libraries/adb-backend-webusb/src/backend.ts b/libraries/adb-backend-webusb/src/backend.ts index 40f1f529..7bae9d08 100644 --- a/libraries/adb-backend-webusb/src/backend.ts +++ b/libraries/adb-backend-webusb/src/backend.ts @@ -1,21 +1,14 @@ -import { - AdbPacketHeader, - AdbPacketSerializeStream, - type AdbBackend, - type AdbPacketData, - type AdbPacketInit, -} from "@yume-chan/adb"; +import type { AdbBackend, AdbPacketData, AdbPacketInit } from "@yume-chan/adb"; +import { AdbPacketHeader, AdbPacketSerializeStream } from "@yume-chan/adb"; +import type { ReadableWritablePair } from "@yume-chan/stream-extra"; import { DuplexStreamFactory, ReadableStream, WritableStream, pipeFrom, - type ReadableWritablePair, } from "@yume-chan/stream-extra"; -import { - EMPTY_UINT8_ARRAY, - type StructDeserializeStream, -} from "@yume-chan/struct"; +import type { StructDeserializeStream } from "@yume-chan/struct"; +import { EMPTY_UINT8_ARRAY } from "@yume-chan/struct"; /** * `classCode`, `subclassCode` and `protocolCode` are required diff --git a/libraries/adb-backend-ws/src/index.ts b/libraries/adb-backend-ws/src/index.ts index 9611ea55..075cd1f9 100644 --- a/libraries/adb-backend-ws/src/index.ts +++ b/libraries/adb-backend-ws/src/index.ts @@ -1,8 +1,5 @@ -import { - AdbPacket, - AdbPacketSerializeStream, - type AdbBackend, -} from "@yume-chan/adb"; +import type { AdbBackend } from "@yume-chan/adb"; +import { AdbPacket, AdbPacketSerializeStream } from "@yume-chan/adb"; import { DuplexStreamFactory, ReadableStream, diff --git a/libraries/adb-credential-web/src/index.ts b/libraries/adb-credential-web/src/index.ts index 6b7f7a62..58c4ed72 100644 --- a/libraries/adb-credential-web/src/index.ts +++ b/libraries/adb-credential-web/src/index.ts @@ -1,5 +1,6 @@ // cspell: ignore RSASSA +import type { AdbCredentialStore } from "@yume-chan/adb"; import { calculateBase64EncodedLength, calculatePublicKey, @@ -7,7 +8,6 @@ import { decodeBase64, decodeUtf8, encodeBase64, - type AdbCredentialStore, } from "@yume-chan/adb"; export default class AdbWebCredentialStore implements AdbCredentialStore { diff --git a/libraries/adb/src/adb.ts b/libraries/adb/src/adb.ts index ca7f36bb..fd0470e5 100644 --- a/libraries/adb/src/adb.ts +++ b/libraries/adb/src/adb.ts @@ -1,17 +1,18 @@ import { PromiseResolver } from "@yume-chan/async"; +import type { ReadableWritablePair } from "@yume-chan/stream-extra"; import { AbortController, DecodeUtf8Stream, GatherStringStream, WritableStream, - type ReadableWritablePair, } from "@yume-chan/stream-extra"; +import type { AdbCredentialStore } from "./auth.js"; import { ADB_DEFAULT_AUTHENTICATORS, AdbAuthenticationProcessor, - type AdbCredentialStore, } from "./auth.js"; +import type { AdbFrameBuffer } from "./commands/index.js"; import { AdbPower, AdbReverseCommand, @@ -21,21 +22,16 @@ import { escapeArg, framebuffer, install, - type AdbFrameBuffer, } from "./commands/index.js"; import { AdbFeatures } from "./features.js"; -import { - AdbCommand, - calculateChecksum, - type AdbPacketData, - type AdbPacketInit, -} from "./packet.js"; -import { - AdbPacketDispatcher, - type AdbIncomingSocketHandler, - type AdbSocket, - type Closeable, +import type { AdbPacketData, AdbPacketInit } from "./packet.js"; +import { AdbCommand, calculateChecksum } from "./packet.js"; +import type { + AdbIncomingSocketHandler, + AdbSocket, + Closeable, } from "./socket/index.js"; +import { AdbPacketDispatcher } from "./socket/index.js"; import { decodeUtf8, encodeUtf8 } from "./utils/index.js"; export enum AdbPropKey { diff --git a/libraries/adb/src/auth.ts b/libraries/adb/src/auth.ts index b6f33dc9..a18b5f0b 100644 --- a/libraries/adb/src/auth.ts +++ b/libraries/adb/src/auth.ts @@ -1,13 +1,14 @@ import { PromiseResolver } from "@yume-chan/async"; -import { type Disposable } from "@yume-chan/event"; -import { type ValueOrPromise } from "@yume-chan/struct"; +import type { Disposable } from "@yume-chan/event"; +import type { ValueOrPromise } from "@yume-chan/struct"; import { calculatePublicKey, calculatePublicKeyLength, sign, } from "./crypto.js"; -import { AdbCommand, type AdbPacketData } from "./packet.js"; +import type { AdbPacketData } from "./packet.js"; +import { AdbCommand } from "./packet.js"; import { calculateBase64EncodedLength, encodeBase64 } from "./utils/index.js"; export type AdbKeyIterable = Iterable | AsyncIterable; diff --git a/libraries/adb/src/backend.ts b/libraries/adb/src/backend.ts index c77aad75..40511018 100644 --- a/libraries/adb/src/backend.ts +++ b/libraries/adb/src/backend.ts @@ -1,7 +1,7 @@ -import { type ReadableWritablePair } from "@yume-chan/stream-extra"; -import { type ValueOrPromise } from "@yume-chan/struct"; +import type { ReadableWritablePair } from "@yume-chan/stream-extra"; +import type { ValueOrPromise } from "@yume-chan/struct"; -import { type AdbPacketData, type AdbPacketInit } from "./packet.js"; +import type { AdbPacketData, AdbPacketInit } from "./packet.js"; export interface AdbBackend { readonly serial: string; diff --git a/libraries/adb/src/commands/base.ts b/libraries/adb/src/commands/base.ts index 96a98b70..b24d89ef 100644 --- a/libraries/adb/src/commands/base.ts +++ b/libraries/adb/src/commands/base.ts @@ -1,6 +1,6 @@ import { AutoDisposable } from "@yume-chan/event"; -import { type Adb } from "../adb.js"; +import type { Adb } from "../adb.js"; export class AdbCommandBase extends AutoDisposable { protected adb: Adb; diff --git a/libraries/adb/src/commands/framebuffer.ts b/libraries/adb/src/commands/framebuffer.ts index b629a0ce..843c4313 100644 --- a/libraries/adb/src/commands/framebuffer.ts +++ b/libraries/adb/src/commands/framebuffer.ts @@ -1,7 +1,7 @@ import { BufferedReadableStream } from "@yume-chan/stream-extra"; import Struct from "@yume-chan/struct"; -import { type Adb } from "../adb.js"; +import type { Adb } from "../adb.js"; const Version = new Struct({ littleEndian: true }).uint32("version"); diff --git a/libraries/adb/src/commands/install.ts b/libraries/adb/src/commands/install.ts index d26841cf..edfe1b3f 100644 --- a/libraries/adb/src/commands/install.ts +++ b/libraries/adb/src/commands/install.ts @@ -1,12 +1,10 @@ -import { - WrapWritableStream, - type WritableStream, -} from "@yume-chan/stream-extra"; +import type { WritableStream } from "@yume-chan/stream-extra"; +import { WrapWritableStream } from "@yume-chan/stream-extra"; -import { type Adb } from "../adb.js"; +import type { Adb } from "../adb.js"; import { escapeArg } from "./subprocess/index.js"; -import { type AdbSync } from "./sync/index.js"; +import type { AdbSync } from "./sync/index.js"; export function install(adb: Adb): WritableStream { const filename = `/data/local/tmp/${Math.random() diff --git a/libraries/adb/src/commands/reverse.ts b/libraries/adb/src/commands/reverse.ts index 1189a67d..79df5ce3 100644 --- a/libraries/adb/src/commands/reverse.ts +++ b/libraries/adb/src/commands/reverse.ts @@ -7,11 +7,8 @@ import { } from "@yume-chan/stream-extra"; import Struct from "@yume-chan/struct"; -import { type Adb } from "../adb.js"; -import { - type AdbIncomingSocketHandler, - type AdbSocket, -} from "../socket/index.js"; +import type { Adb } from "../adb.js"; +import type { AdbIncomingSocketHandler, AdbSocket } from "../socket/index.js"; import { decodeUtf8 } from "../utils/index.js"; export interface AdbForwardListener { diff --git a/libraries/adb/src/commands/subprocess/command.ts b/libraries/adb/src/commands/subprocess/command.ts index 28803871..8663071a 100644 --- a/libraries/adb/src/commands/subprocess/command.ts +++ b/libraries/adb/src/commands/subprocess/command.ts @@ -2,11 +2,13 @@ import { DecodeUtf8Stream, GatherStringStream } from "@yume-chan/stream-extra"; import { AdbCommandBase } from "../base.js"; +import type { + AdbSubprocessProtocol, + AdbSubprocessProtocolConstructor, +} from "./protocols/index.js"; import { AdbSubprocessNoneProtocol, AdbSubprocessShellProtocol, - type AdbSubprocessProtocol, - type AdbSubprocessProtocolConstructor, } from "./protocols/index.js"; export interface AdbSubprocessOptions { diff --git a/libraries/adb/src/commands/subprocess/protocols/none.ts b/libraries/adb/src/commands/subprocess/protocols/none.ts index 01c9df50..e0ee41db 100644 --- a/libraries/adb/src/commands/subprocess/protocols/none.ts +++ b/libraries/adb/src/commands/subprocess/protocols/none.ts @@ -1,9 +1,9 @@ -import { DuplexStreamFactory, ReadableStream } from '@yume-chan/stream-extra'; +import { DuplexStreamFactory, ReadableStream } from "@yume-chan/stream-extra"; -import { type Adb } from "../../../adb.js"; -import { type AdbSocket } from "../../../socket/index.js"; +import type { Adb } from "../../../adb.js"; +import type { AdbSocket } from "../../../socket/index.js"; -import { type AdbSubprocessProtocol } from "./types.js"; +import type { AdbSubprocessProtocol } from "./types.js"; /** * The legacy shell diff --git a/libraries/adb/src/commands/subprocess/protocols/shell.ts b/libraries/adb/src/commands/subprocess/protocols/shell.ts index 0256ac0a..0be05029 100644 --- a/libraries/adb/src/commands/subprocess/protocols/shell.ts +++ b/libraries/adb/src/commands/subprocess/protocols/shell.ts @@ -1,4 +1,9 @@ -import { PromiseResolver } from '@yume-chan/async'; +import { PromiseResolver } from "@yume-chan/async"; +import type { + PushReadableStreamController, + ReadableStream, + WritableStreamDefaultWriter, +} from "@yume-chan/stream-extra"; import { PushReadableStream, StructDeserializeStream, @@ -6,18 +11,16 @@ import { TransformStream, WritableStream, pipeFrom, - type PushReadableStreamController, - type ReadableStream, - type WritableStreamDefaultWriter, } from "@yume-chan/stream-extra"; -import Struct, { placeholder, type StructValueType } from '@yume-chan/struct'; +import type { StructValueType } from "@yume-chan/struct"; +import Struct, { placeholder } from "@yume-chan/struct"; -import { type Adb } from "../../../adb.js"; +import type { Adb } from "../../../adb.js"; import { AdbFeatures } from "../../../features.js"; -import { type AdbSocket } from "../../../socket/index.js"; +import type { AdbSocket } from "../../../socket/index.js"; import { encodeUtf8 } from "../../../utils/index.js"; -import { type AdbSubprocessProtocol } from "./types.js"; +import type { AdbSubprocessProtocol } from "./types.js"; export enum AdbShellProtocolId { Stdin, diff --git a/libraries/adb/src/commands/subprocess/protocols/types.ts b/libraries/adb/src/commands/subprocess/protocols/types.ts index 411d620d..af195600 100644 --- a/libraries/adb/src/commands/subprocess/protocols/types.ts +++ b/libraries/adb/src/commands/subprocess/protocols/types.ts @@ -1,11 +1,8 @@ -import { - type ReadableStream, - type WritableStream, -} from "@yume-chan/stream-extra"; -import { type ValueOrPromise } from "@yume-chan/struct"; +import type { ReadableStream, WritableStream } from "@yume-chan/stream-extra"; +import type { ValueOrPromise } from "@yume-chan/struct"; -import { type Adb } from "../../../adb.js"; -import { type AdbSocket } from "../../../socket/index.js"; +import type { Adb } from "../../../adb.js"; +import type { AdbSocket } from "../../../socket/index.js"; export interface AdbSubprocessProtocol { /** diff --git a/libraries/adb/src/commands/sync/list.ts b/libraries/adb/src/commands/sync/list.ts index 885b52f4..bdb0e83e 100644 --- a/libraries/adb/src/commands/sync/list.ts +++ b/libraries/adb/src/commands/sync/list.ts @@ -1,16 +1,13 @@ -import { - type BufferedReadableStream, - type WritableStreamDefaultWriter, +import type { + BufferedReadableStream, + WritableStreamDefaultWriter, } from "@yume-chan/stream-extra"; import Struct from "@yume-chan/struct"; import { AdbSyncRequestId, adbSyncWriteRequest } from "./request.js"; import { AdbSyncResponseId, adbSyncReadResponses } from "./response.js"; -import { - AdbSyncLstatResponse, - AdbSyncStatResponse, - type AdbSyncStat, -} from "./stat.js"; +import type { AdbSyncStat } from "./stat.js"; +import { AdbSyncLstatResponse, AdbSyncStatResponse } from "./stat.js"; export interface AdbSyncEntry extends AdbSyncStat { name: string; diff --git a/libraries/adb/src/commands/sync/pull.ts b/libraries/adb/src/commands/sync/pull.ts index bbc149a4..23be6842 100644 --- a/libraries/adb/src/commands/sync/pull.ts +++ b/libraries/adb/src/commands/sync/pull.ts @@ -1,8 +1,8 @@ -import { - ReadableStream, - type BufferedReadableStream, - type WritableStreamDefaultWriter, +import type { + BufferedReadableStream, + WritableStreamDefaultWriter, } from "@yume-chan/stream-extra"; +import { ReadableStream } from "@yume-chan/stream-extra"; import Struct from "@yume-chan/struct"; import { AdbSyncRequestId, adbSyncWriteRequest } from "./request.js"; diff --git a/libraries/adb/src/commands/sync/push.ts b/libraries/adb/src/commands/sync/push.ts index b2d752cb..7ac2d819 100644 --- a/libraries/adb/src/commands/sync/push.ts +++ b/libraries/adb/src/commands/sync/push.ts @@ -1,10 +1,8 @@ -import { - ChunkStream, - WritableStream, - pipeFrom, - type BufferedReadableStream, - type WritableStreamDefaultWriter, +import type { + BufferedReadableStream, + WritableStreamDefaultWriter, } from "@yume-chan/stream-extra"; +import { ChunkStream, WritableStream, pipeFrom } from "@yume-chan/stream-extra"; import Struct from "@yume-chan/struct"; import { AdbSyncRequestId, adbSyncWriteRequest } from "./request.js"; diff --git a/libraries/adb/src/commands/sync/request.ts b/libraries/adb/src/commands/sync/request.ts index 88965577..4fc220c9 100644 --- a/libraries/adb/src/commands/sync/request.ts +++ b/libraries/adb/src/commands/sync/request.ts @@ -1,4 +1,4 @@ -import { type WritableStreamDefaultWriter } from "@yume-chan/stream-extra"; +import type { WritableStreamDefaultWriter } from "@yume-chan/stream-extra"; import Struct from "@yume-chan/struct"; import { encodeUtf8 } from "../../utils/index.js"; diff --git a/libraries/adb/src/commands/sync/response.ts b/libraries/adb/src/commands/sync/response.ts index 4dff704f..8b612338 100644 --- a/libraries/adb/src/commands/sync/response.ts +++ b/libraries/adb/src/commands/sync/response.ts @@ -1,8 +1,6 @@ -import { type BufferedReadableStream } from "@yume-chan/stream-extra"; -import Struct, { - type StructLike, - type StructValueType, -} from "@yume-chan/struct"; +import type { BufferedReadableStream } from "@yume-chan/stream-extra"; +import type { StructLike, StructValueType } from "@yume-chan/struct"; +import Struct from "@yume-chan/struct"; import { decodeUtf8 } from "../../utils/index.js"; diff --git a/libraries/adb/src/commands/sync/stat.ts b/libraries/adb/src/commands/sync/stat.ts index 39e25949..17ee7843 100644 --- a/libraries/adb/src/commands/sync/stat.ts +++ b/libraries/adb/src/commands/sync/stat.ts @@ -1,6 +1,6 @@ -import { - type BufferedReadableStream, - type WritableStreamDefaultWriter, +import type { + BufferedReadableStream, + WritableStreamDefaultWriter, } from "@yume-chan/stream-extra"; import Struct, { placeholder } from "@yume-chan/struct"; diff --git a/libraries/adb/src/commands/sync/sync.ts b/libraries/adb/src/commands/sync/sync.ts index 7d6f2c06..522369b7 100644 --- a/libraries/adb/src/commands/sync/sync.ts +++ b/libraries/adb/src/commands/sync/sync.ts @@ -1,20 +1,23 @@ import { AutoDisposable } from "@yume-chan/event"; +import type { + ReadableStream, + WritableStream, + WritableStreamDefaultWriter, +} from "@yume-chan/stream-extra"; import { BufferedReadableStream, WrapReadableStream, WrapWritableStream, - type ReadableStream, - type WritableStream, - type WritableStreamDefaultWriter, } from "@yume-chan/stream-extra"; -import { type Adb } from "../../adb.js"; +import type { Adb } from "../../adb.js"; import { AdbFeatures } from "../../features.js"; -import { type AdbSocket } from "../../socket/index.js"; +import type { AdbSocket } from "../../socket/index.js"; import { AutoResetEvent } from "../../utils/index.js"; import { escapeArg } from "../subprocess/index.js"; -import { adbSyncOpenDir, type AdbSyncEntry } from "./list.js"; +import type { AdbSyncEntry } from "./list.js"; +import { adbSyncOpenDir } from "./list.js"; import { adbSyncPull } from "./pull.js"; import { adbSyncPush } from "./push.js"; import { adbSyncLstat, adbSyncStat } from "./stat.js"; diff --git a/libraries/adb/src/socket/dispatcher.ts b/libraries/adb/src/socket/dispatcher.ts index c36de67c..a6ac7fcc 100644 --- a/libraries/adb/src/socket/dispatcher.ts +++ b/libraries/adb/src/socket/dispatcher.ts @@ -1,22 +1,19 @@ import { AsyncOperationManager, PromiseResolver } from "@yume-chan/async"; -import { type RemoveEventListener } from "@yume-chan/event"; -import { - AbortController, - WritableStream, - type ReadableWritablePair, - type WritableStreamDefaultWriter, +import type { RemoveEventListener } from "@yume-chan/event"; +import type { + ReadableWritablePair, + WritableStreamDefaultWriter, } from "@yume-chan/stream-extra"; -import { EMPTY_UINT8_ARRAY, type ValueOrPromise } from "@yume-chan/struct"; +import { AbortController, WritableStream } from "@yume-chan/stream-extra"; +import type { ValueOrPromise } from "@yume-chan/struct"; +import { EMPTY_UINT8_ARRAY } from "@yume-chan/struct"; -import { - AdbCommand, - calculateChecksum, - type AdbPacketData, - type AdbPacketInit, -} from "../packet.js"; +import type { AdbPacketData, AdbPacketInit } from "../packet.js"; +import { AdbCommand, calculateChecksum } from "../packet.js"; import { decodeUtf8, encodeUtf8 } from "../utils/index.js"; -import { AdbSocketController, type AdbSocket } from "./socket.js"; +import type { AdbSocket } from "./socket.js"; +import { AdbSocketController } from "./socket.js"; export interface AdbPacketDispatcherOptions { calculateChecksum: boolean; diff --git a/libraries/adb/src/socket/socket.ts b/libraries/adb/src/socket/socket.ts index eaa1a18e..48b29ab9 100644 --- a/libraries/adb/src/socket/socket.ts +++ b/libraries/adb/src/socket/socket.ts @@ -1,19 +1,21 @@ import { PromiseResolver } from "@yume-chan/async"; -import { type Disposable } from "@yume-chan/event"; +import type { Disposable } from "@yume-chan/event"; +import type { + PushReadableStreamController, + ReadableStream, + ReadableWritablePair, +} from "@yume-chan/stream-extra"; import { ChunkStream, DuplexStreamFactory, PushReadableStream, WritableStream, pipeFrom, - type PushReadableStreamController, - type ReadableStream, - type ReadableWritablePair, } from "@yume-chan/stream-extra"; import { AdbCommand } from "../packet.js"; -import { type AdbPacketDispatcher, type Closeable } from "./dispatcher.js"; +import type { AdbPacketDispatcher, Closeable } from "./dispatcher.js"; export interface AdbSocketInfo { localId: number; diff --git a/libraries/adb/src/utils/auto-reset-event.ts b/libraries/adb/src/utils/auto-reset-event.ts index 97d20236..2561b264 100644 --- a/libraries/adb/src/utils/auto-reset-event.ts +++ b/libraries/adb/src/utils/auto-reset-event.ts @@ -1,5 +1,5 @@ import { PromiseResolver } from "@yume-chan/async"; -import { type Disposable } from "@yume-chan/event"; +import type { Disposable } from "@yume-chan/event"; export class AutoResetEvent implements Disposable { private _set: boolean; diff --git a/libraries/adb/src/utils/conditional-variable.ts b/libraries/adb/src/utils/conditional-variable.ts index 74bc8779..7a070ea8 100644 --- a/libraries/adb/src/utils/conditional-variable.ts +++ b/libraries/adb/src/utils/conditional-variable.ts @@ -1,5 +1,5 @@ import { PromiseResolver } from "@yume-chan/async"; -import { type Disposable } from "@yume-chan/event"; +import type { Disposable } from "@yume-chan/event"; interface WaitEntry { condition: () => boolean; diff --git a/libraries/android-bin/src/bug-report.ts b/libraries/android-bin/src/bug-report.ts index 967ce853..0709b36a 100644 --- a/libraries/android-bin/src/bug-report.ts +++ b/libraries/android-bin/src/bug-report.ts @@ -2,13 +2,13 @@ // cspell: ignore bugreportz import { AdbCommandBase, AdbSubprocessShellProtocol } from "@yume-chan/adb"; +import type { ReadableStream } from "@yume-chan/stream-extra"; import { DecodeUtf8Stream, PushReadableStream, SplitStringStream, WrapReadableStream, WritableStream, - type ReadableStream, } from "@yume-chan/stream-extra"; export interface BugReportZVersion { diff --git a/libraries/android-bin/src/demo-mode.ts b/libraries/android-bin/src/demo-mode.ts index 6adeb8b4..15977c98 100644 --- a/libraries/android-bin/src/demo-mode.ts +++ b/libraries/android-bin/src/demo-mode.ts @@ -4,7 +4,8 @@ // cspell: ignore systemui // cspell: ignore sysui -import { AdbCommandBase, type Adb } from "@yume-chan/adb"; +import type { Adb } from "@yume-chan/adb"; +import { AdbCommandBase } from "@yume-chan/adb"; import { Settings } from "./settings.js"; diff --git a/libraries/android-bin/src/logcat.ts b/libraries/android-bin/src/logcat.ts index 960004b9..3c3295c8 100644 --- a/libraries/android-bin/src/logcat.ts +++ b/libraries/android-bin/src/logcat.ts @@ -2,18 +2,16 @@ // cspell: ignore usec import { AdbCommandBase, AdbSubprocessNoneProtocol } from "@yume-chan/adb"; +import type { ReadableStream } from "@yume-chan/stream-extra"; import { BufferedTransformStream, DecodeUtf8Stream, SplitStringStream, WrapReadableStream, WritableStream, - type ReadableStream, } from "@yume-chan/stream-extra"; -import Struct, { - decodeUtf8, - type StructAsyncDeserializeStream, -} from "@yume-chan/struct"; +import type { StructAsyncDeserializeStream } from "@yume-chan/struct"; +import Struct, { decodeUtf8 } from "@yume-chan/struct"; // `adb logcat` is an alias to `adb shell logcat` // so instead of adding to core library, it's implemented here diff --git a/libraries/android-bin/src/overlay-display.ts b/libraries/android-bin/src/overlay-display.ts index 0883388e..ab629390 100644 --- a/libraries/android-bin/src/overlay-display.ts +++ b/libraries/android-bin/src/overlay-display.ts @@ -1,4 +1,5 @@ -import { AdbCommandBase, type Adb } from "@yume-chan/adb"; +import type { Adb } from "@yume-chan/adb"; +import { AdbCommandBase } from "@yume-chan/adb"; import { Settings } from "./settings.js"; diff --git a/libraries/b-tree/src/index.spec.ts b/libraries/b-tree/src/index.spec.ts index 1cf8c0ce..4cefd4d4 100644 --- a/libraries/b-tree/src/index.spec.ts +++ b/libraries/b-tree/src/index.spec.ts @@ -1,6 +1,7 @@ import { describe, expect, it } from "@jest/globals"; -import { BTree, type BTreeNode } from "./index.js"; +import type { BTreeNode } from "./index.js"; +import { BTree } from "./index.js"; const LENGTH = 128; diff --git a/libraries/event/src/disposable.spec.ts b/libraries/event/src/disposable.spec.ts index 9a6088e7..396e0519 100644 --- a/libraries/event/src/disposable.spec.ts +++ b/libraries/event/src/disposable.spec.ts @@ -1,6 +1,7 @@ import { describe, expect, it, jest } from "@jest/globals"; -import { AutoDisposable, type Disposable } from "./disposable.js"; +import type { Disposable } from "./disposable.js"; +import { AutoDisposable } from "./disposable.js"; describe("Event", () => { describe("AutoDisposable", () => { diff --git a/libraries/event/src/event-emitter.ts b/libraries/event/src/event-emitter.ts index d8972466..38c84bfb 100644 --- a/libraries/event/src/event-emitter.ts +++ b/libraries/event/src/event-emitter.ts @@ -1,5 +1,5 @@ -import { type Disposable } from "./disposable.js"; -import { type EventListener, type RemoveEventListener } from "./event.js"; +import type { Disposable } from "./disposable.js"; +import type { EventListener, RemoveEventListener } from "./event.js"; export interface EventListenerInfo { listener: EventListener; diff --git a/libraries/event/src/event.ts b/libraries/event/src/event.ts index 1c0ee654..12d9074d 100644 --- a/libraries/event/src/event.ts +++ b/libraries/event/src/event.ts @@ -1,4 +1,4 @@ -import { type Disposable } from "./disposable.js"; +import type { Disposable } from "./disposable.js"; export interface EventListener< TEvent, diff --git a/libraries/event/src/utils.ts b/libraries/event/src/utils.ts index 2bc42743..f5910f32 100644 --- a/libraries/event/src/utils.ts +++ b/libraries/event/src/utils.ts @@ -1,6 +1,6 @@ import { PromiseResolver } from "@yume-chan/async"; -import { type Event } from "./event.js"; +import type { Event } from "./event.js"; export async function once(event: Event): Promise { const resolver = new PromiseResolver(); diff --git a/libraries/scrcpy/src/adb/client.ts b/libraries/scrcpy/src/adb/client.ts index b3713a86..ee4a1c3b 100644 --- a/libraries/scrcpy/src/adb/client.ts +++ b/libraries/scrcpy/src/adb/client.ts @@ -1,10 +1,13 @@ +import type { Adb, AdbSubprocessProtocol, AdbSync } from "@yume-chan/adb"; import { AdbReverseNotSupportedError, AdbSubprocessNoneProtocol, - type Adb, - type AdbSubprocessProtocol, - type AdbSync, } from "@yume-chan/adb"; +import type { + ReadableStreamDefaultController, + ReadableStreamDefaultReader, + ReadableWritablePair, +} from "@yume-chan/stream-extra"; import { AbortController, DecodeUtf8Stream, @@ -13,24 +16,19 @@ import { SplitStringStream, WrapWritableStream, WritableStream, - type ReadableStreamDefaultController, - type ReadableStreamDefaultReader, - type ReadableWritablePair, } from "@yume-chan/stream-extra"; import { ScrcpyControlMessageSerializer } from "../control/index.js"; -import { - ScrcpyDeviceMessageDeserializeStream, - type ScrcpyDeviceMessage, -} from "../device-message/index.js"; -import { - DEFAULT_SERVER_PATH, - type ScrcpyOptionsInit1_16, - type ScrcpyVideoStreamPacket, +import type { ScrcpyDeviceMessage } from "../device-message/index.js"; +import { ScrcpyDeviceMessageDeserializeStream } from "../device-message/index.js"; +import type { + ScrcpyOptionsInit1_16, + ScrcpyVideoStreamPacket, } from "../options/index.js"; +import { DEFAULT_SERVER_PATH } from "../options/index.js"; -import { type AdbScrcpyConnection } from "./connection.js"; -import { type AdbScrcpyOptions } from "./options/index.js"; +import type { AdbScrcpyConnection } from "./connection.js"; +import type { AdbScrcpyOptions } from "./options/index.js"; class ArrayToStream extends ReadableStream { private array!: T[]; diff --git a/libraries/scrcpy/src/adb/connection.ts b/libraries/scrcpy/src/adb/connection.ts index 09f3d06f..872cc653 100644 --- a/libraries/scrcpy/src/adb/connection.ts +++ b/libraries/scrcpy/src/adb/connection.ts @@ -1,13 +1,14 @@ -import { AdbReverseNotSupportedError, type Adb } from "@yume-chan/adb"; +import type { Adb } from "@yume-chan/adb"; +import { AdbReverseNotSupportedError } from "@yume-chan/adb"; import { delay } from "@yume-chan/async"; -import { type Disposable } from "@yume-chan/event"; -import { - TransformStream, - type ReadableStream, - type ReadableStreamDefaultReader, - type ReadableWritablePair, +import type { Disposable } from "@yume-chan/event"; +import type { + ReadableStream, + ReadableStreamDefaultReader, + ReadableWritablePair, } from "@yume-chan/stream-extra"; -import { type ValueOrPromise } from "@yume-chan/struct"; +import { TransformStream } from "@yume-chan/stream-extra"; +import type { ValueOrPromise } from "@yume-chan/struct"; export interface AdbScrcpyConnectionOptions { control: boolean; diff --git a/libraries/scrcpy/src/adb/options/1_16.ts b/libraries/scrcpy/src/adb/options/1_16.ts index 49e0b28b..f1c315aa 100644 --- a/libraries/scrcpy/src/adb/options/1_16.ts +++ b/libraries/scrcpy/src/adb/options/1_16.ts @@ -1,11 +1,13 @@ -import { type Adb } from "@yume-chan/adb"; +import type { Adb } from "@yume-chan/adb"; -import { type ScrcpyOptionsInit1_16 } from "../../options/index.js"; +import type { ScrcpyOptionsInit1_16 } from "../../options/index.js"; +import type { + AdbScrcpyConnection, + AdbScrcpyConnectionOptions, +} from "../connection.js"; import { AdbScrcpyForwardConnection, AdbScrcpyReverseConnection, - type AdbScrcpyConnection, - type AdbScrcpyConnectionOptions, } from "../connection.js"; import { AdbScrcpyOptionsBase } from "./types.js"; diff --git a/libraries/scrcpy/src/adb/options/1_22.ts b/libraries/scrcpy/src/adb/options/1_22.ts index 03737dcb..88a3e3e8 100644 --- a/libraries/scrcpy/src/adb/options/1_22.ts +++ b/libraries/scrcpy/src/adb/options/1_22.ts @@ -1,10 +1,10 @@ -import { type Adb } from "@yume-chan/adb"; +import type { Adb } from "@yume-chan/adb"; -import { type ScrcpyOptionsInit1_22 } from "../../options/index.js"; +import type { ScrcpyOptionsInit1_22 } from "../../options/index.js"; +import type { AdbScrcpyConnection } from "../connection.js"; import { AdbScrcpyForwardConnection, AdbScrcpyReverseConnection, - type AdbScrcpyConnection, } from "../connection.js"; import { AdbScrcpyOptions1_16 } from "./1_16.js"; diff --git a/libraries/scrcpy/src/adb/options/types.ts b/libraries/scrcpy/src/adb/options/types.ts index 28dc1b0d..29c0029c 100644 --- a/libraries/scrcpy/src/adb/options/types.ts +++ b/libraries/scrcpy/src/adb/options/types.ts @@ -1,16 +1,16 @@ -import { type Adb } from "@yume-chan/adb"; -import { type TransformStream } from "@yume-chan/stream-extra"; +import type { Adb } from "@yume-chan/adb"; +import type { TransformStream } from "@yume-chan/stream-extra"; -import { - type ScrcpyBackOrScreenOnControlMessage, - type ScrcpyControlMessageType, - type ScrcpySetClipboardControlMessage, +import type { + ScrcpyBackOrScreenOnControlMessage, + ScrcpyControlMessageType, + ScrcpySetClipboardControlMessage, } from "../../control/index.js"; -import { - type ScrcpyOptions, - type ScrcpyVideoStreamPacket, +import type { + ScrcpyOptions, + ScrcpyVideoStreamPacket, } from "../../options/index.js"; -import { type AdbScrcpyConnection } from "../connection.js"; +import type { AdbScrcpyConnection } from "../connection.js"; export interface AdbScrcpyOptions extends ScrcpyOptions { createConnection(adb: Adb): AdbScrcpyConnection; diff --git a/libraries/scrcpy/src/control/back-or-screen-on.ts b/libraries/scrcpy/src/control/back-or-screen-on.ts index e372249e..d64e15f1 100644 --- a/libraries/scrcpy/src/control/back-or-screen-on.ts +++ b/libraries/scrcpy/src/control/back-or-screen-on.ts @@ -1,4 +1,4 @@ -import { type ScrcpyBackOrScreenOnControlMessage1_18 } from "../index.js"; +import type { ScrcpyBackOrScreenOnControlMessage1_18 } from "../index.js"; export type ScrcpyBackOrScreenOnControlMessage = ScrcpyBackOrScreenOnControlMessage1_18; diff --git a/libraries/scrcpy/src/control/hover-helper.ts b/libraries/scrcpy/src/control/hover-helper.ts index d5dfa88d..cca31226 100644 --- a/libraries/scrcpy/src/control/hover-helper.ts +++ b/libraries/scrcpy/src/control/hover-helper.ts @@ -1,7 +1,5 @@ -import { - AndroidMotionEventAction, - type ScrcpyInjectTouchControlMessage, -} from "./inject-touch.js"; +import type { ScrcpyInjectTouchControlMessage } from "./inject-touch.js"; +import { AndroidMotionEventAction } from "./inject-touch.js"; import { ScrcpyControlMessageType } from "./type.js"; /** diff --git a/libraries/scrcpy/src/control/inject-scroll.ts b/libraries/scrcpy/src/control/inject-scroll.ts index ffb25def..00f93e80 100644 --- a/libraries/scrcpy/src/control/inject-scroll.ts +++ b/libraries/scrcpy/src/control/inject-scroll.ts @@ -1,4 +1,4 @@ -import { type ScrcpyInjectScrollControlMessage1_25 } from "../options/index.js"; +import type { ScrcpyInjectScrollControlMessage1_25 } from "../options/index.js"; export type ScrcpyInjectScrollControlMessage = ScrcpyInjectScrollControlMessage1_25; diff --git a/libraries/scrcpy/src/control/serializer.ts b/libraries/scrcpy/src/control/serializer.ts index c9ab8fd7..90e8108e 100644 --- a/libraries/scrcpy/src/control/serializer.ts +++ b/libraries/scrcpy/src/control/serializer.ts @@ -1,26 +1,22 @@ -import { - type WritableStream, - type WritableStreamDefaultWriter, +import type { + WritableStream, + WritableStreamDefaultWriter, } from "@yume-chan/stream-extra"; -import { - type ScrcpyOptions, - type ScrcpyOptionsInit1_16, - type ScrcpyScrollController, +import type { + ScrcpyOptions, + ScrcpyOptionsInit1_16, + ScrcpyScrollController, } from "../options/index.js"; -import { - ScrcpyInjectKeyCodeControlMessage, - type AndroidKeyEventAction, -} from "./inject-keycode.js"; -import { type ScrcpyInjectScrollControlMessage } from "./inject-scroll.js"; +import type { AndroidKeyEventAction } from "./inject-keycode.js"; +import { ScrcpyInjectKeyCodeControlMessage } from "./inject-keycode.js"; +import type { ScrcpyInjectScrollControlMessage } from "./inject-scroll.js"; import { ScrcpyInjectTextControlMessage } from "./inject-text.js"; import { ScrcpyInjectTouchControlMessage } from "./inject-touch.js"; import { ScrcpyRotateDeviceControlMessage } from "./rotate-device.js"; -import { - ScrcpySetScreenPowerModeControlMessage, - type AndroidScreenPowerMode, -} from "./set-screen-power-mode.js"; +import type { AndroidScreenPowerMode } from "./set-screen-power-mode.js"; +import { ScrcpySetScreenPowerModeControlMessage } from "./set-screen-power-mode.js"; import { ScrcpyControlMessageType } from "./type.js"; export class ScrcpyControlMessageSerializer { diff --git a/libraries/scrcpy/src/control/set-clipboard.ts b/libraries/scrcpy/src/control/set-clipboard.ts index dd0b75a2..02b788a5 100644 --- a/libraries/scrcpy/src/control/set-clipboard.ts +++ b/libraries/scrcpy/src/control/set-clipboard.ts @@ -1,4 +1,4 @@ -import { type ScrcpySetClipboardControlMessage1_21 } from "../options/index.js"; +import type { ScrcpySetClipboardControlMessage1_21 } from "../options/index.js"; export type ScrcpySetClipboardControlMessage = ScrcpySetClipboardControlMessage1_21; diff --git a/libraries/scrcpy/src/options/1_16/codec-options.ts b/libraries/scrcpy/src/options/1_16/codec-options.ts index c55c69d1..fd3c5c3f 100644 --- a/libraries/scrcpy/src/options/1_16/codec-options.ts +++ b/libraries/scrcpy/src/options/1_16/codec-options.ts @@ -1,8 +1,5 @@ -import { - type AndroidCodecLevel, - type AndroidCodecProfile, -} from "../../codec.js"; -import { type ScrcpyOptionValue } from "../types.js"; +import type { AndroidCodecLevel, AndroidCodecProfile } from "../../codec.js"; +import type { ScrcpyOptionValue } from "../types.js"; /** * If the option you need is not in this type, diff --git a/libraries/scrcpy/src/options/1_16/options.ts b/libraries/scrcpy/src/options/1_16/options.ts index 968f3d9f..77042ad5 100644 --- a/libraries/scrcpy/src/options/1_16/options.ts +++ b/libraries/scrcpy/src/options/1_16/options.ts @@ -4,17 +4,16 @@ import { } from "@yume-chan/stream-extra"; import Struct from "@yume-chan/struct"; +import type { + ScrcpyBackOrScreenOnControlMessage, + ScrcpySetClipboardControlMessage, +} from "../../control/index.js"; import { AndroidKeyEventAction, ScrcpyControlMessageType, - type ScrcpyBackOrScreenOnControlMessage, - type ScrcpySetClipboardControlMessage, } from "../../control/index.js"; -import { - toScrcpyOptionValue, - type ScrcpyOptions, - type ScrcpyVideoStreamPacket, -} from "../types.js"; +import type { ScrcpyOptions, ScrcpyVideoStreamPacket } from "../types.js"; +import { toScrcpyOptionValue } from "../types.js"; import { CodecOptions } from "./codec-options.js"; import { @@ -22,10 +21,8 @@ import { parseSequenceParameterSet, removeH264Emulation, } from "./h264-configuration.js"; -import { - ScrcpyScrollController1_16, - type ScrcpyScrollController, -} from "./scroll.js"; +import type { ScrcpyScrollController } from "./scroll.js"; +import { ScrcpyScrollController1_16 } from "./scroll.js"; export enum ScrcpyLogLevel { Verbose = "verbose", diff --git a/libraries/scrcpy/src/options/1_16/scroll.ts b/libraries/scrcpy/src/options/1_16/scroll.ts index e37190d7..be8ac69c 100644 --- a/libraries/scrcpy/src/options/1_16/scroll.ts +++ b/libraries/scrcpy/src/options/1_16/scroll.ts @@ -1,9 +1,7 @@ import Struct from "@yume-chan/struct"; -import { - ScrcpyControlMessageType, - type ScrcpyInjectScrollControlMessage, -} from "../../control/index.js"; +import type { ScrcpyInjectScrollControlMessage } from "../../control/index.js"; +import { ScrcpyControlMessageType } from "../../control/index.js"; export interface ScrcpyScrollController { serializeScrollMessage( diff --git a/libraries/scrcpy/src/options/1_18.ts b/libraries/scrcpy/src/options/1_18.ts index 0187ff1c..9e3ea5ef 100644 --- a/libraries/scrcpy/src/options/1_18.ts +++ b/libraries/scrcpy/src/options/1_18.ts @@ -1,15 +1,15 @@ import Struct, { placeholder } from "@yume-chan/struct"; -import { - ScrcpyControlMessageType, - type AndroidKeyEventAction, - type ScrcpyBackOrScreenOnControlMessage, +import type { + AndroidKeyEventAction, + ScrcpyBackOrScreenOnControlMessage, } from "../control/index.js"; +import { ScrcpyControlMessageType } from "../control/index.js"; +import type { ScrcpyOptionsInit1_16 } from "./1_16/options.js"; import { ScrcpyBackOrScreenOnControlMessage1_16, ScrcpyOptions1_16, - type ScrcpyOptionsInit1_16, } from "./1_16/options.js"; export interface ScrcpyOptionsInit1_18 extends ScrcpyOptionsInit1_16 { diff --git a/libraries/scrcpy/src/options/1_21.ts b/libraries/scrcpy/src/options/1_21.ts index 09526f8a..8da5ccd9 100644 --- a/libraries/scrcpy/src/options/1_21.ts +++ b/libraries/scrcpy/src/options/1_21.ts @@ -2,12 +2,11 @@ import Struct from "@yume-chan/struct"; -import { - ScrcpyControlMessageType, - type ScrcpySetClipboardControlMessage, -} from "../control/index.js"; +import type { ScrcpySetClipboardControlMessage } from "../control/index.js"; +import { ScrcpyControlMessageType } from "../control/index.js"; -import { ScrcpyOptions1_18, type ScrcpyOptionsInit1_18 } from "./1_18.js"; +import type { ScrcpyOptionsInit1_18 } from "./1_18.js"; +import { ScrcpyOptions1_18 } from "./1_18.js"; import { toScrcpyOptionValue } from "./types.js"; export interface ScrcpyOptionsInit1_21 extends ScrcpyOptionsInit1_18 { diff --git a/libraries/scrcpy/src/options/1_22/options.ts b/libraries/scrcpy/src/options/1_22/options.ts index 724eb396..5233a1ae 100644 --- a/libraries/scrcpy/src/options/1_22/options.ts +++ b/libraries/scrcpy/src/options/1_22/options.ts @@ -1,5 +1,6 @@ -import { type ScrcpyScrollController } from "../1_16/index.js"; -import { ScrcpyOptions1_21, type ScrcpyOptionsInit1_21 } from "../1_21.js"; +import type { ScrcpyScrollController } from "../1_16/index.js"; +import type { ScrcpyOptionsInit1_21 } from "../1_21.js"; +import { ScrcpyOptions1_21 } from "../1_21.js"; import { ScrcpyScrollController1_22 } from "./scroll.js"; diff --git a/libraries/scrcpy/src/options/1_23.ts b/libraries/scrcpy/src/options/1_23.ts index a814c4df..f72b1e88 100644 --- a/libraries/scrcpy/src/options/1_23.ts +++ b/libraries/scrcpy/src/options/1_23.ts @@ -1,10 +1,8 @@ import { TransformStream } from "@yume-chan/stream-extra"; -import { - ScrcpyOptions1_22, - type ScrcpyOptionsInit1_22, -} from "./1_22/options.js"; -import { type ScrcpyVideoStreamPacket } from "./types.js"; +import type { ScrcpyOptionsInit1_22 } from "./1_22/options.js"; +import { ScrcpyOptions1_22 } from "./1_22/options.js"; +import type { ScrcpyVideoStreamPacket } from "./types.js"; export interface ScrcpyOptionsInit1_23 extends ScrcpyOptionsInit1_22 { cleanup: boolean; diff --git a/libraries/scrcpy/src/options/1_24.ts b/libraries/scrcpy/src/options/1_24.ts index a049c5c5..60bfd269 100644 --- a/libraries/scrcpy/src/options/1_24.ts +++ b/libraries/scrcpy/src/options/1_24.ts @@ -1,11 +1,13 @@ -import { ScrcpyOptions1_23, type ScrcpyOptionsInit1_23 } from './1_23.js'; +import type { ScrcpyOptionsInit1_23 } from "./1_23.js"; +import { ScrcpyOptions1_23 } from "./1_23.js"; export interface ScrcpyOptionsInit1_24 extends ScrcpyOptionsInit1_23 { powerOn: boolean; } -export class ScrcpyOptions1_24 - extends ScrcpyOptions1_23 { +export class ScrcpyOptions1_24< + T extends ScrcpyOptionsInit1_24 = ScrcpyOptionsInit1_24 +> extends ScrcpyOptions1_23 { public constructor(init: Partial) { super(init); } diff --git a/libraries/scrcpy/src/options/1_25/options.ts b/libraries/scrcpy/src/options/1_25/options.ts index efbf7c93..020e3d17 100644 --- a/libraries/scrcpy/src/options/1_25/options.ts +++ b/libraries/scrcpy/src/options/1_25/options.ts @@ -1,5 +1,6 @@ -import { type ScrcpyScrollController } from "../1_16/index.js"; -import { ScrcpyOptions1_24, type ScrcpyOptionsInit1_24 } from "../1_24.js"; +import type { ScrcpyScrollController } from "../1_16/index.js"; +import type { ScrcpyOptionsInit1_24 } from "../1_24.js"; +import { ScrcpyOptions1_24 } from "../1_24.js"; import { ScrcpyScrollController1_25 } from "./scroll.js"; diff --git a/libraries/scrcpy/src/options/1_25/scroll.ts b/libraries/scrcpy/src/options/1_25/scroll.ts index 34189994..99bb3806 100644 --- a/libraries/scrcpy/src/options/1_25/scroll.ts +++ b/libraries/scrcpy/src/options/1_25/scroll.ts @@ -3,12 +3,9 @@ import Struct, { NumberFieldType, } from "@yume-chan/struct"; -import { - clamp, - ScrcpyControlMessageType, - type ScrcpyInjectScrollControlMessage, -} from "../../control/index.js"; -import { type ScrcpyScrollController } from "../1_16/index.js"; +import type { ScrcpyInjectScrollControlMessage } from "../../control/index.js"; +import { clamp, ScrcpyControlMessageType } from "../../control/index.js"; +import type { ScrcpyScrollController } from "../1_16/index.js"; export const ScrcpyFloatToInt16NumberType: NumberFieldType = { size: 2, diff --git a/libraries/scrcpy/src/options/types.ts b/libraries/scrcpy/src/options/types.ts index 6dc6f34a..50e1cfe3 100644 --- a/libraries/scrcpy/src/options/types.ts +++ b/libraries/scrcpy/src/options/types.ts @@ -1,12 +1,12 @@ -import { type TransformStream } from "@yume-chan/stream-extra"; +import type { TransformStream } from "@yume-chan/stream-extra"; -import { - type ScrcpyBackOrScreenOnControlMessage, - type ScrcpyControlMessageType, - type ScrcpySetClipboardControlMessage, +import type { + ScrcpyBackOrScreenOnControlMessage, + ScrcpyControlMessageType, + ScrcpySetClipboardControlMessage, } from "../control/index.js"; -import { type ScrcpyScrollController } from "./1_16/scroll.js"; +import type { ScrcpyScrollController } from "./1_16/scroll.js"; export const DEFAULT_SERVER_PATH = "/data/local/tmp/scrcpy-server.jar"; diff --git a/libraries/stream-extra/src/buffered-transform.ts b/libraries/stream-extra/src/buffered-transform.ts index a967cef5..ac354b06 100644 --- a/libraries/stream-extra/src/buffered-transform.ts +++ b/libraries/stream-extra/src/buffered-transform.ts @@ -1,18 +1,13 @@ -import { type ValueOrPromise } from "@yume-chan/struct"; +import type { ValueOrPromise } from "@yume-chan/struct"; import { BufferedReadableStream, BufferedReadableStreamEndedError, } from "./buffered.js"; -import { - PushReadableStream, - type PushReadableStreamController, -} from "./push-readable.js"; -import { - ReadableStream, - WritableStream, - type ReadableWritablePair, -} from "./stream.js"; +import type { PushReadableStreamController } from "./push-readable.js"; +import { PushReadableStream } from "./push-readable.js"; +import type { ReadableWritablePair } from "./stream.js"; +import { ReadableStream, WritableStream } from "./stream.js"; // TODO: BufferedTransformStream: find better implementation export class BufferedTransformStream diff --git a/libraries/stream-extra/src/buffered.ts b/libraries/stream-extra/src/buffered.ts index 48197509..9d445c41 100644 --- a/libraries/stream-extra/src/buffered.ts +++ b/libraries/stream-extra/src/buffered.ts @@ -1,8 +1,5 @@ import { PushReadableStream } from "./push-readable.js"; -import { - type ReadableStream, - type ReadableStreamDefaultReader, -} from "./stream.js"; +import type { ReadableStream, ReadableStreamDefaultReader } from "./stream.js"; export class BufferedReadableStreamEndedError extends Error { public constructor() { diff --git a/libraries/stream-extra/src/duplex.ts b/libraries/stream-extra/src/duplex.ts index 79e4bf63..d768b18c 100644 --- a/libraries/stream-extra/src/duplex.ts +++ b/libraries/stream-extra/src/duplex.ts @@ -1,12 +1,12 @@ import { PromiseResolver } from "@yume-chan/async"; -import { type ValueOrPromise } from "@yume-chan/struct"; +import type { ValueOrPromise } from "@yume-chan/struct"; -import { - WritableStream, - type ReadableStream, - type ReadableStreamDefaultController, - type WritableStreamDefaultWriter, +import type { + ReadableStream, + ReadableStreamDefaultController, + WritableStreamDefaultWriter, } from "./stream.js"; +import { WritableStream } from "./stream.js"; import { WrapReadableStream } from "./wrap-readable.js"; export interface DuplexStreamFactoryOptions { diff --git a/libraries/stream-extra/src/pipe-from.ts b/libraries/stream-extra/src/pipe-from.ts index e05454d7..bb0496b9 100644 --- a/libraries/stream-extra/src/pipe-from.ts +++ b/libraries/stream-extra/src/pipe-from.ts @@ -1,4 +1,5 @@ -import { WritableStream, type ReadableWritablePair } from "./stream.js"; +import type { ReadableWritablePair } from "./stream.js"; +import { WritableStream } from "./stream.js"; /** * Pipe `pair.readable` to `writable`, then returns `pair.writable`. @@ -9,10 +10,12 @@ import { WritableStream, type ReadableWritablePair } from "./stream.js"; * @param pair A `TransformStream` that converts chunks. * @returns `pair`'s `writable` stream. */ -export function pipeFrom(writable: WritableStream, pair: ReadableWritablePair) { +export function pipeFrom( + writable: WritableStream, + pair: ReadableWritablePair +) { const writer = pair.writable.getWriter(); - const pipe = pair.readable - .pipeTo(writable); + const pipe = pair.readable.pipeTo(writable); return new WritableStream({ async write(chunk) { await writer.ready; @@ -21,6 +24,6 @@ export function pipeFrom(writable: WritableStream, pair: ReadableWritab async close() { await writer.close(); await pipe; - } + }, }); } diff --git a/libraries/stream-extra/src/push-readable.ts b/libraries/stream-extra/src/push-readable.ts index 11c6ab25..4ab3f5dc 100644 --- a/libraries/stream-extra/src/push-readable.ts +++ b/libraries/stream-extra/src/push-readable.ts @@ -1,11 +1,7 @@ import { PromiseResolver } from "@yume-chan/async"; -import { - AbortController, - ReadableStream, - type AbortSignal, - type QueuingStrategy, -} from "./stream.js"; +import type { AbortSignal, QueuingStrategy } from "./stream.js"; +import { AbortController, ReadableStream } from "./stream.js"; export interface PushReadableStreamController { abortSignal: AbortSignal; diff --git a/libraries/stream-extra/src/stream.ts b/libraries/stream-extra/src/stream.ts index f6e287f6..a04f58ea 100644 --- a/libraries/stream-extra/src/stream.ts +++ b/libraries/stream-extra/src/stream.ts @@ -1,8 +1,8 @@ +import type { AbortSignal } from "web-streams-polyfill"; import { ReadableStream as ReadableStreamPolyfill, TransformStream as TransformStreamPolyfill, WritableStream as WritableStreamPolyfill, - type AbortSignal, } from "web-streams-polyfill"; export * from "web-streams-polyfill"; diff --git a/libraries/stream-extra/src/struct-deserialize.ts b/libraries/stream-extra/src/struct-deserialize.ts index d59ef23d..1431158a 100644 --- a/libraries/stream-extra/src/struct-deserialize.ts +++ b/libraries/stream-extra/src/struct-deserialize.ts @@ -1,5 +1,5 @@ import type Struct from "@yume-chan/struct"; -import { type StructValueType } from "@yume-chan/struct"; +import type { StructValueType } from "@yume-chan/struct"; import { BufferedTransformStream } from "./buffered-transform.js"; diff --git a/libraries/stream-extra/src/wrap-readable.ts b/libraries/stream-extra/src/wrap-readable.ts index facfa124..50a64492 100644 --- a/libraries/stream-extra/src/wrap-readable.ts +++ b/libraries/stream-extra/src/wrap-readable.ts @@ -1,10 +1,10 @@ -import { type ValueOrPromise } from "@yume-chan/struct"; +import type { ValueOrPromise } from "@yume-chan/struct"; -import { - ReadableStream, - type ReadableStreamDefaultController, - type ReadableStreamDefaultReader, +import type { + ReadableStreamDefaultController, + ReadableStreamDefaultReader, } from "./stream.js"; +import { ReadableStream } from "./stream.js"; export type WrapReadableStreamStart = ( controller: ReadableStreamDefaultController diff --git a/libraries/stream-extra/src/wrap-writable.ts b/libraries/stream-extra/src/wrap-writable.ts index e84f8b14..cf927e89 100644 --- a/libraries/stream-extra/src/wrap-writable.ts +++ b/libraries/stream-extra/src/wrap-writable.ts @@ -1,6 +1,7 @@ -import { type ValueOrPromise } from "@yume-chan/struct"; +import type { ValueOrPromise } from "@yume-chan/struct"; -import { WritableStream, type WritableStreamDefaultWriter } from "./stream.js"; +import type { WritableStreamDefaultWriter } from "./stream.js"; +import { WritableStream } from "./stream.js"; export type WrapWritableStreamStart = () => ValueOrPromise< WritableStream diff --git a/libraries/struct/src/basic/definition.spec.ts b/libraries/struct/src/basic/definition.spec.ts index 7f5e774f..6186c728 100644 --- a/libraries/struct/src/basic/definition.spec.ts +++ b/libraries/struct/src/basic/definition.spec.ts @@ -1,15 +1,15 @@ import { describe, expect, it } from "@jest/globals"; -import { type ValueOrPromise } from "../utils.js"; +import type { ValueOrPromise } from "../utils.js"; import { StructFieldDefinition } from "./definition.js"; -import { type StructFieldValue } from "./field-value.js"; -import { type StructOptions } from "./options.js"; -import { - type StructAsyncDeserializeStream, - type StructDeserializeStream, +import type { StructFieldValue } from "./field-value.js"; +import type { StructOptions } from "./options.js"; +import type { + StructAsyncDeserializeStream, + StructDeserializeStream, } from "./stream.js"; -import { type StructValue } from "./struct-value.js"; +import type { StructValue } from "./struct-value.js"; describe("StructFieldDefinition", () => { describe(".constructor", () => { diff --git a/libraries/struct/src/basic/definition.ts b/libraries/struct/src/basic/definition.ts index a9a17867..ae9a3502 100644 --- a/libraries/struct/src/basic/definition.ts +++ b/libraries/struct/src/basic/definition.ts @@ -1,10 +1,10 @@ -import { type StructFieldValue } from "./field-value.js"; -import { type StructOptions } from "./options.js"; -import { - type StructAsyncDeserializeStream, - type StructDeserializeStream, +import type { StructFieldValue } from "./field-value.js"; +import type { StructOptions } from "./options.js"; +import type { + StructAsyncDeserializeStream, + StructDeserializeStream, } from "./stream.js"; -import { type StructValue } from "./struct-value.js"; +import type { StructValue } from "./struct-value.js"; /** * A field definition defines how to deserialize a field. diff --git a/libraries/struct/src/basic/field-value.spec.ts b/libraries/struct/src/basic/field-value.spec.ts index acfb5b3a..03e7fe60 100644 --- a/libraries/struct/src/basic/field-value.spec.ts +++ b/libraries/struct/src/basic/field-value.spec.ts @@ -1,15 +1,15 @@ import { describe, expect, it } from "@jest/globals"; -import { type ValueOrPromise } from "../utils.js"; +import type { ValueOrPromise } from "../utils.js"; import { StructFieldDefinition } from "./definition.js"; import { StructFieldValue } from "./field-value.js"; -import { type StructOptions } from "./options.js"; -import { - type StructAsyncDeserializeStream, - type StructDeserializeStream, +import type { StructOptions } from "./options.js"; +import type { + StructAsyncDeserializeStream, + StructDeserializeStream, } from "./stream.js"; -import { type StructValue } from "./struct-value.js"; +import type { StructValue } from "./struct-value.js"; describe("StructFieldValue", () => { describe(".constructor", () => { diff --git a/libraries/struct/src/basic/field-value.ts b/libraries/struct/src/basic/field-value.ts index f107ce01..06783902 100644 --- a/libraries/struct/src/basic/field-value.ts +++ b/libraries/struct/src/basic/field-value.ts @@ -1,6 +1,6 @@ -import { type StructFieldDefinition } from "./definition.js"; -import { type StructOptions } from "./options.js"; -import { type StructValue } from "./struct-value.js"; +import type { StructFieldDefinition } from "./definition.js"; +import type { StructOptions } from "./options.js"; +import type { StructValue } from "./struct-value.js"; /** * A field value defines how to serialize a field. diff --git a/libraries/struct/src/basic/stream.ts b/libraries/struct/src/basic/stream.ts index ab9e3183..4713bd5c 100644 --- a/libraries/struct/src/basic/stream.ts +++ b/libraries/struct/src/basic/stream.ts @@ -1,4 +1,4 @@ -import { type ValueOrPromise } from "../utils.js"; +import type { ValueOrPromise } from "../utils.js"; // TODO: allow over reading (returning a `Uint8Array`, an `offset` and a `length`) to avoid copying diff --git a/libraries/struct/src/basic/struct-value.ts b/libraries/struct/src/basic/struct-value.ts index ed775bf8..0c21037e 100644 --- a/libraries/struct/src/basic/struct-value.ts +++ b/libraries/struct/src/basic/struct-value.ts @@ -1,4 +1,4 @@ -import { type StructFieldValue } from "./field-value.js"; +import type { StructFieldValue } from "./field-value.js"; export const STRUCT_VALUE_SYMBOL = Symbol("struct-value"); diff --git a/libraries/struct/src/struct.spec.ts b/libraries/struct/src/struct.spec.ts index eb8d3cab..748d76c6 100644 --- a/libraries/struct/src/struct.spec.ts +++ b/libraries/struct/src/struct.spec.ts @@ -1,14 +1,15 @@ import { describe, expect, it, jest } from "@jest/globals"; -import { - StructDefaultOptions, - StructFieldDefinition, - type StructAsyncDeserializeStream, - type StructDeserializeStream, - type StructFieldValue, - type StructOptions, - type StructValue, +import type { + StructAsyncDeserializeStream, + StructDeserializeStream, + StructFieldValue, + StructOptions, + StructValue, } from "./basic/index.js"; +import { StructDefaultOptions, StructFieldDefinition } from "./basic/index.js"; +import { Struct } from "./struct.js"; +import type { ValueOrPromise } from "./utils.js"; import { BigIntFieldDefinition, @@ -20,9 +21,6 @@ import { VariableLengthBufferLikeFieldDefinition, } from "./index.js"; -import { Struct } from "./struct.js"; -import { type ValueOrPromise } from "./utils.js"; - class MockDeserializationStream implements StructDeserializeStream { public buffer = new Uint8Array(0); diff --git a/libraries/struct/src/struct.ts b/libraries/struct/src/struct.ts index 754dc937..88e3490e 100644 --- a/libraries/struct/src/struct.ts +++ b/libraries/struct/src/struct.ts @@ -1,14 +1,22 @@ +import type { + StructAsyncDeserializeStream, + StructDeserializeStream, + StructFieldDefinition, + StructFieldValue, + StructOptions, +} from "./basic/index.js"; import { STRUCT_VALUE_SYMBOL, StructDefaultOptions, StructValue, - type StructAsyncDeserializeStream, - type StructDeserializeStream, - type StructFieldDefinition, - type StructFieldValue, - type StructOptions, } from "./basic/index.js"; import { SyncPromise } from "./sync-promise.js"; +import type { + BufferFieldSubType, + FixedLengthBufferLikeFieldOptions, + LengthField, + VariableLengthBufferLikeFieldOptions, +} from "./types/index.js"; import { BigIntFieldDefinition, BigIntFieldType, @@ -18,17 +26,8 @@ import { StringBufferFieldSubType, Uint8ArrayBufferFieldSubType, VariableLengthBufferLikeFieldDefinition, - type BufferFieldSubType, - type FixedLengthBufferLikeFieldOptions, - type LengthField, - type VariableLengthBufferLikeFieldOptions, } from "./types/index.js"; -import { - type Evaluate, - type Identity, - type Overwrite, - type ValueOrPromise, -} from "./utils.js"; +import type { Evaluate, Identity, Overwrite, ValueOrPromise } from "./utils.js"; export interface StructLike { deserialize( diff --git a/libraries/struct/src/types/bigint.ts b/libraries/struct/src/types/bigint.ts index cfcff6c4..581b6207 100644 --- a/libraries/struct/src/types/bigint.ts +++ b/libraries/struct/src/types/bigint.ts @@ -5,16 +5,15 @@ import { setBigUint64, } from "@yume-chan/dataview-bigint-polyfill/esm/fallback.js"; -import { - StructFieldDefinition, - StructFieldValue, - type StructAsyncDeserializeStream, - type StructDeserializeStream, - type StructOptions, - type StructValue, +import type { + StructAsyncDeserializeStream, + StructDeserializeStream, + StructOptions, + StructValue, } from "../basic/index.js"; +import { StructFieldDefinition, StructFieldValue } from "../basic/index.js"; import { SyncPromise } from "../sync-promise.js"; -import { type ValueOrPromise } from "../utils.js"; +import type { ValueOrPromise } from "../utils.js"; type DataViewBigInt64Getter = ( dataView: DataView, diff --git a/libraries/struct/src/types/buffer/base.spec.ts b/libraries/struct/src/types/buffer/base.spec.ts index 105ff732..c924d027 100644 --- a/libraries/struct/src/types/buffer/base.spec.ts +++ b/libraries/struct/src/types/buffer/base.spec.ts @@ -1,17 +1,14 @@ import { describe, expect, it, jest } from "@jest/globals"; -import { - StructDefaultOptions, - StructValue, - type StructDeserializeStream, -} from "../../basic/index.js"; +import type { StructDeserializeStream } from "../../basic/index.js"; +import { StructDefaultOptions, StructValue } from "../../basic/index.js"; +import type { BufferFieldSubType } from "./base.js"; import { BufferLikeFieldDefinition, EMPTY_UINT8_ARRAY, StringBufferFieldSubType, Uint8ArrayBufferFieldSubType, - type BufferFieldSubType, } from "./base.js"; class MockDeserializationStream implements StructDeserializeStream { diff --git a/libraries/struct/src/types/buffer/base.ts b/libraries/struct/src/types/buffer/base.ts index 768b70ab..7bb43fe8 100644 --- a/libraries/struct/src/types/buffer/base.ts +++ b/libraries/struct/src/types/buffer/base.ts @@ -1,13 +1,13 @@ -import { - StructFieldDefinition, - StructFieldValue, - type StructAsyncDeserializeStream, - type StructDeserializeStream, - type StructOptions, - type StructValue, +import type { + StructAsyncDeserializeStream, + StructDeserializeStream, + StructOptions, + StructValue, } from "../../basic/index.js"; +import { StructFieldDefinition, StructFieldValue } from "../../basic/index.js"; import { SyncPromise } from "../../sync-promise.js"; -import { decodeUtf8, encodeUtf8, type ValueOrPromise } from "../../utils.js"; +import type { ValueOrPromise } from "../../utils.js"; +import { decodeUtf8, encodeUtf8 } from "../../utils.js"; /** * Base class for all types that diff --git a/libraries/struct/src/types/buffer/fixed-length.ts b/libraries/struct/src/types/buffer/fixed-length.ts index 30bb06ff..a603c40b 100644 --- a/libraries/struct/src/types/buffer/fixed-length.ts +++ b/libraries/struct/src/types/buffer/fixed-length.ts @@ -1,4 +1,5 @@ -import { BufferLikeFieldDefinition, type BufferFieldSubType } from "./base.js"; +import type { BufferFieldSubType } from "./base.js"; +import { BufferLikeFieldDefinition } from "./base.js"; export interface FixedLengthBufferLikeFieldOptions { length: number; diff --git a/libraries/struct/src/types/buffer/variable-length.ts b/libraries/struct/src/types/buffer/variable-length.ts index 49f27b46..93a116d6 100644 --- a/libraries/struct/src/types/buffer/variable-length.ts +++ b/libraries/struct/src/types/buffer/variable-length.ts @@ -1,16 +1,13 @@ -import { - StructFieldValue, - type StructFieldDefinition, - type StructOptions, - type StructValue, +import type { + StructFieldDefinition, + StructOptions, + StructValue, } from "../../basic/index.js"; -import { type KeysOfType } from "../../utils.js"; +import { StructFieldValue } from "../../basic/index.js"; +import type { KeysOfType } from "../../utils.js"; -import { - BufferLikeFieldDefinition, - BufferLikeFieldValue, - type BufferFieldSubType, -} from "./base.js"; +import type { BufferFieldSubType } from "./base.js"; +import { BufferLikeFieldDefinition, BufferLikeFieldValue } from "./base.js"; export type LengthField = KeysOfType; diff --git a/libraries/struct/src/types/number.spec.ts b/libraries/struct/src/types/number.spec.ts index b0da48e3..fc586405 100644 --- a/libraries/struct/src/types/number.spec.ts +++ b/libraries/struct/src/types/number.spec.ts @@ -1,10 +1,7 @@ import { describe, expect, it, jest, test } from "@jest/globals"; -import { - StructDefaultOptions, - StructValue, - type StructDeserializeStream, -} from "../basic/index.js"; +import type { StructDeserializeStream } from "../basic/index.js"; +import { StructDefaultOptions, StructValue } from "../basic/index.js"; import { NumberFieldDefinition, NumberFieldType } from "./number.js"; diff --git a/libraries/struct/src/types/number.ts b/libraries/struct/src/types/number.ts index 2d2d414c..a06f5909 100644 --- a/libraries/struct/src/types/number.ts +++ b/libraries/struct/src/types/number.ts @@ -1,13 +1,12 @@ -import { - StructFieldDefinition, - StructFieldValue, - type StructAsyncDeserializeStream, - type StructDeserializeStream, - type StructOptions, - type StructValue, +import type { + StructAsyncDeserializeStream, + StructDeserializeStream, + StructOptions, + StructValue, } from "../basic/index.js"; +import { StructFieldDefinition, StructFieldValue } from "../basic/index.js"; import { SyncPromise } from "../sync-promise.js"; -import { type ValueOrPromise } from "../utils.js"; +import type { ValueOrPromise } from "../utils.js"; export interface NumberFieldType { signed: boolean; diff --git a/toolchain/eslint-config/index.js b/toolchain/eslint-config/index.js index 4f864f74..fa1598cc 100644 --- a/toolchain/eslint-config/index.js +++ b/toolchain/eslint-config/index.js @@ -19,9 +19,9 @@ module.exports = { }, ], - "import/consistent-type-specifier-style": ["error", "prefer-inline"], + "import/consistent-type-specifier-style": ["error", "prefer-top-level"], "import/no-cycle": "error", - "import/no-duplicates": "error", + "import/no-duplicates": ["error", { "prefer-inline": false }], "import/order": [ "error", {