Sort imports with prettier (livekit#669)

* Sort imports with prettier

* switch plugins

.prettierrc

@@ -3,5 +3,10 @@
  "trailingComma": "all",
  "semi": true,
  "tabWidth": 2,
- "printWidth": 100
+ "printWidth": 100,
+ "importOrder": ["<THIRD_PARTY_MODULES>", "^[./]"],
+ "importOrderSeparation": false,
+ "importOrderSortSpecifiers": true,
+ "importOrderParserPlugins": ["typescript"],
+ "plugins": ["@trivago/prettier-plugin-sort-imports"]
 }

example/sample.ts

@@ -1,7 +1,6 @@
 import {
  ConnectionQuality,
  ConnectionState,
- createAudioAnalyser,
  DataPacket_Kind,
  DisconnectReason,
  LocalAudioTrack,
@@ -17,25 +16,25 @@ import {
  RoomConnectOptions,
  RoomEvent,
  RoomOptions,
- setLogLevel,
  Track,
  TrackPublication,
  VideoCaptureOptions,
  VideoCodec,
  VideoPresets,
  VideoQuality,
+ createAudioAnalyser,
+ setLogLevel,
 } from '../src/index';
 import { SimulationScenario } from '../src/room/types';
 
-const $ = (id: string) => document.getElementById(id);
+const $ = <T extends HTMLElement>(id: string) => document.getElementById(id) as T;
 
 const state = {
  isFrontFacing: false,
  encoder: new TextEncoder(),
  decoder: new TextDecoder(),
  defaultDevices: new Map<MediaDeviceKind, string>(),
  bitrateInterval: undefined as any,
- dataFireInterval: undefined as any,
 };
 let currentRoom: Room | undefined;
 
@@ -44,8 +43,8 @@ let startTime: number;
 const searchParams = new URLSearchParams(window.location.search);
 const storedUrl = searchParams.get('url') ?? 'ws:https://localhost:7880';
 const storedToken = searchParams.get('token') ?? '';
-(<HTMLInputElement>$('url')).value = storedUrl;
-(<HTMLInputElement>$('token')).value = storedToken;
+$<HTMLInputElement>('url').value = storedUrl;
+$<HTMLInputElement>('token').value = storedToken;
 
 function updateSearchParams(url: string, token: string) {
  const params = new URLSearchParams({ url, token });

package.json

@@ -53,13 +53,14 @@
  "devDependencies": {
  "@babel/core": "7.21.4",
  "@babel/preset-env": "7.21.4",
- "@livekit/changesets-changelog-github": "^0.0.4",
  "@changesets/cli": "2.26.1",
+ "@livekit/changesets-changelog-github": "^0.0.4",
  "@rollup/plugin-babel": "6.0.3",
  "@rollup/plugin-commonjs": "24.1.0",
  "@rollup/plugin-json": "6.0.0",
  "@rollup/plugin-node-resolve": "15.0.2",
  "@rollup/plugin-terser": "^0.4.0",
+ "@trivago/prettier-plugin-sort-imports": "^4.1.1",
  "@types/jest": "29.5.0",
  "@types/sdp-transform": "2.4.6",
  "@types/ua-parser-js": "0.7.36",
@@ -73,7 +74,7 @@
  "eslint-plugin-import": "2.27.5",
  "gh-pages": "5.0.0",
  "jest": "29.5.0",
- "prettier": "2.8.7",
+ "prettier": "^2.8.8",
  "rollup": "3.20.2",
  "rollup-plugin-delete": "^2.0.0",
  "rollup-plugin-filesize": "10.0.0",

src/api/SignalClient.ts

@@ -33,7 +33,7 @@ import {
 } from '../proto/livekit_rtc';
 import { ConnectionError, ConnectionErrorReason } from '../room/errors';
 import CriticalTimers from '../room/timers';
-import { getClientInfo, isReactNative, Mutex, sleep } from '../room/utils';
+import { Mutex, getClientInfo, isReactNative, sleep } from '../room/utils';
 
 // internal options
 interface ConnectOpts {

src/connectionHelper/ConnectionCheck.ts

@@ -1,7 +1,6 @@
 import EventEmitter from 'events';
 import type TypedEmitter from 'typed-emitter';
-
-import { Checker, CheckInfo, CheckStatus, InstantiableCheck } from './checks/Checker';
+import { CheckInfo, CheckStatus, Checker, InstantiableCheck } from './checks/Checker';
 import { PublishAudioCheck } from './checks/publishAudio';
 import { PublishVideoCheck } from './checks/publishVideo';
 import { ReconnectCheck } from './checks/reconnect';

src/connectionHelper/checks/Checker.ts

@@ -1,8 +1,8 @@
 import { EventEmitter } from 'events';
 import type TypedEmitter from 'typed-emitter';
 import type { RoomConnectOptions, RoomOptions } from '../../options';
-import Room, { ConnectionState } from '../../room/Room';
 import type RTCEngine from '../../room/RTCEngine';
+import Room, { ConnectionState } from '../../room/Room';
 
 type LogMessage = {
  level: 'info' | 'warning' | 'error';

src/connectionHelper/checks/reconnect.ts

@@ -1,5 +1,5 @@
-import { RoomEvent } from '../../room/events';
 import { ConnectionState } from '../../room/Room';
+import { RoomEvent } from '../../room/events';
 import { Checker } from './Checker';
 
 export class ReconnectCheck extends Checker {

src/index.ts

@@ -1,35 +1,33 @@
 import { LogLevel, setLogExtension, setLogLevel } from './logger';
 import { DataPacket_Kind, DisconnectReason, VideoQuality } from './proto/livekit_models';
 import DefaultReconnectPolicy from './room/DefaultReconnectPolicy';
+import Room, { ConnectionState, RoomState } from './room/Room';
 import LocalParticipant from './room/participant/LocalParticipant';
 import Participant, { ConnectionQuality } from './room/participant/Participant';
 import type { ParticipantTrackPermission } from './room/participant/ParticipantTrackPermission';
 import RemoteParticipant from './room/participant/RemoteParticipant';
-import Room, { ConnectionState, RoomState } from './room/Room';
+import CriticalTimers from './room/timers';
 import LocalAudioTrack from './room/track/LocalAudioTrack';
 import LocalTrack from './room/track/LocalTrack';
 import LocalTrackPublication from './room/track/LocalTrackPublication';
 import LocalVideoTrack from './room/track/LocalVideoTrack';
 import RemoteAudioTrack from './room/track/RemoteAudioTrack';
 import RemoteTrack from './room/track/RemoteTrack';
 import RemoteTrackPublication from './room/track/RemoteTrackPublication';
-import RemoteVideoTrack from './room/track/RemoteVideoTrack';
-import type { ElementInfo } from './room/track/RemoteVideoTrack';
+import RemoteVideoTrack, { type ElementInfo } from './room/track/RemoteVideoTrack';
 import { TrackPublication } from './room/track/TrackPublication';
-import CriticalTimers from './room/timers';
+import type { LiveKitReactNativeInfo } from './room/types';
 import {
+ type AudioAnalyserOptions,
+ createAudioAnalyser,
  getEmptyAudioStreamTrack,
  getEmptyVideoStreamTrack,
  isBrowserSupported,
- supportsAdaptiveStream,
  supportsAV1,
+ supportsAdaptiveStream,
  supportsDynacast,
- createAudioAnalyser,
 } from './room/utils';
 
-import type { AudioAnalyserOptions } from './room/utils';
-import type { LiveKitReactNativeInfo } from './room/types';
-
 export * from './options';
 export * from './room/errors';
 export * from './room/events';

src/room/RTCEngine.ts

@@ -22,6 +22,9 @@ import {
  SignalTarget,
  TrackPublishedResponse,
 } from '../proto/livekit_rtc';
+import PCTransport, { PCEvents } from './PCTransport';
+import type { ReconnectContext, ReconnectPolicy } from './ReconnectPolicy';
+import { RegionUrlProvider } from './RegionUrlProvider';
 import { roomConnectOptionDefaults } from './defaults';
 import {
  ConnectionError,
@@ -31,24 +34,21 @@ import {
  UnexpectedConnectionState,
 } from './errors';
 import { EngineEvent } from './events';
-import PCTransport, { PCEvents } from './PCTransport';
-import type { ReconnectContext, ReconnectPolicy } from './ReconnectPolicy';
 import CriticalTimers from './timers';
 import type LocalTrack from './track/LocalTrack';
 import type LocalVideoTrack from './track/LocalVideoTrack';
 import type { SimulcastTrackInfo } from './track/LocalVideoTrack';
-import type { TrackPublishOptions, VideoCodec } from './track/options';
 import { Track } from './track/Track';
+import type { TrackPublishOptions, VideoCodec } from './track/options';
 import {
+ Mutex,
  isCloud,
  isWeb,
- Mutex,
  sleep,
  supportsAddTrack,
  supportsSetCodecPreferences,
  supportsTransceiver,
 } from './utils';
-import { RegionUrlProvider } from './RegionUrlProvider';
 
 const lossyDataChannel = '_lossy';
 const reliableDataChannel = '_reliable';

src/room/RegionUrlProvider.ts

@@ -1,6 +1,6 @@
+import log from '../logger';
 import type { RegionInfo, RegionSettings } from '../proto/livekit_rtc';
 import { ConnectionError, ConnectionErrorReason } from './errors';
-import log from '../logger';
 import { isCloud } from './utils';
 
 export class RegionUrlProvider {

src/room/participant/RemoteParticipant.ts

@@ -3,13 +3,13 @@ import log from '../../logger';
 import type { ParticipantInfo } from '../../proto/livekit_models';
 import type { UpdateSubscription, UpdateTrackSettings } from '../../proto/livekit_rtc';
 import { ParticipantEvent, TrackEvent } from '../events';
-import type { AudioOutputOptions } from '../track/options';
 import RemoteAudioTrack from '../track/RemoteAudioTrack';
 import type RemoteTrack from '../track/RemoteTrack';
 import RemoteTrackPublication from '../track/RemoteTrackPublication';
 import RemoteVideoTrack from '../track/RemoteVideoTrack';
 import { Track } from '../track/Track';
 import type { TrackPublication } from '../track/TrackPublication';
+import type { AudioOutputOptions } from '../track/options';
 import type { AdaptiveStreamSettings } from '../track/types';
 import Participant, { ParticipantEventCallbacks } from './Participant';
 

src/room/participant/publishUtils.test.ts

@@ -3,8 +3,8 @@ import {
  computeDefaultScreenShareSimulcastPresets,
  computeVideoEncodings,
  determineAppropriateEncoding,
- presets169,
  presets43,
+ presets169,
  presetsForResolution,
  presetsScreenShare,
  sortPresets,

src/room/participant/publishUtils.ts

@@ -2,6 +2,7 @@ import log from '../../logger';
 import { TrackInvalidError } from '../errors';
 import LocalAudioTrack from '../track/LocalAudioTrack';
 import LocalVideoTrack from '../track/LocalVideoTrack';
+import { Track } from '../track/Track';
 import {
  BackupVideoCodec,
  ScreenSharePresets,
@@ -12,7 +13,6 @@ import {
  VideoPresets,
  VideoPresets43,
 } from '../track/options';
-import { Track } from '../track/Track';
 
 /** @internal */
 export function mediaTrackToLocalTrack(

src/room/track/LocalAudioTrack.ts

@@ -3,8 +3,8 @@ import { TrackEvent } from '../events';
 import { AudioSenderStats, computeBitrate, monitorFrequency } from '../stats';
 import { isWeb } from '../utils';
 import LocalTrack from './LocalTrack';
-import type { AudioCaptureOptions } from './options';
 import { Track } from './Track';
+import type { AudioCaptureOptions } from './options';
 import { constraintsForOptions, detectSilence } from './utils';
 
 export default class LocalAudioTrack extends LocalTrack {

src/room/track/LocalTrack.ts

@@ -3,14 +3,14 @@ import DeviceManager from '../DeviceManager';
 import { TrackInvalidError } from '../errors';
 import { TrackEvent } from '../events';
 import {
+ Mutex,
  getEmptyAudioStreamTrack,
  getEmptyVideoStreamTrack,
  isMobile,
- Mutex,
  sleep,
 } from '../utils';
+import { Track, attachToElement, detachTrack } from './Track';
 import type { VideoCodec } from './options';
-import { attachToElement, detachTrack, Track } from './Track';
 
 const defaultDimensionsTimeout = 2 * 1000;
 

src/room/track/LocalTrackPublication.ts

@@ -3,9 +3,9 @@ import { TrackEvent } from '../events';
 import type LocalAudioTrack from './LocalAudioTrack';
 import type LocalTrack from './LocalTrack';
 import type LocalVideoTrack from './LocalVideoTrack';
-import type { TrackPublishOptions } from './options';
 import type { Track } from './Track';
 import { TrackPublication } from './TrackPublication';
+import type { TrackPublishOptions } from './options';
 
 export default class LocalTrackPublication extends TrackPublication {
  track?: LocalTrack = undefined;

src/room/track/LocalVideoTrack.ts

@@ -2,11 +2,11 @@ import type { SignalClient } from '../../api/SignalClient';
 import log from '../../logger';
 import { VideoLayer, VideoQuality } from '../../proto/livekit_models';
 import type { SubscribedCodec, SubscribedQuality } from '../../proto/livekit_rtc';
-import { computeBitrate, monitorFrequency, VideoSenderStats } from '../stats';
-import { isFireFox, isMobile, isWeb, Mutex } from '../utils';
+import { VideoSenderStats, computeBitrate, monitorFrequency } from '../stats';
+import { Mutex, isFireFox, isMobile, isWeb } from '../utils';
 import LocalTrack from './LocalTrack';
-import type { VideoCaptureOptions, VideoCodec } from './options';
 import { Track } from './Track';
+import type { VideoCaptureOptions, VideoCodec } from './options';
 import { constraintsForOptions } from './utils';
 
 export class SimulcastTrackInfo {

src/room/track/RemoteAudioTrack.ts

@@ -2,9 +2,9 @@ import log from '../../logger';
 import { TrackEvent } from '../events';
 import { AudioReceiverStats, computeBitrate } from '../stats';
 import { supportsSetSinkId } from '../utils';
-import type { AudioOutputOptions } from './options';
 import RemoteTrack from './RemoteTrack';
 import { Track } from './Track';
+import type { AudioOutputOptions } from './options';
 
 export default class RemoteAudioTrack extends RemoteTrack {
  private prevStats?: AudioReceiverStats;

src/room/track/RemoteVideoTrack.test.ts

@@ -1,6 +1,6 @@
+import MockMediaStreamTrack from '../../test/MockMediaStreamTrack';
 import { TrackEvent } from '../events';
 import RemoteVideoTrack, { ElementInfo } from './RemoteVideoTrack';
-import MockMediaStreamTrack from '../../test/MockMediaStreamTrack';
 import type { Track } from './Track';
 
 jest.useFakeTimers();

src/room/track/RemoteVideoTrack.ts

@@ -1,17 +1,17 @@
 import { debounce } from 'ts-debounce';
 import log from '../../logger';
 import { TrackEvent } from '../events';
-import { computeBitrate, VideoReceiverStats } from '../stats';
+import { VideoReceiverStats, computeBitrate } from '../stats';
 import CriticalTimers from '../timers';
 import {
+ ObservableMediaElement,
  getDevicePixelRatio,
  getIntersectionObserver,
  getResizeObserver,
  isWeb,
- ObservableMediaElement,
 } from '../utils';
 import RemoteTrack from './RemoteTrack';
-import { attachToElement, detachTrack, Track } from './Track';
+import { Track, attachToElement, detachTrack } from './Track';
 import type { AdaptiveStreamSettings } from './types';
 
 const REACTION_DELAY = 100;

src/room/track/create.ts

@@ -1,18 +1,18 @@
 import DeviceManager from '../DeviceManager';
+import { audioDefaults, videoDefaults } from '../defaults';
 import { DeviceUnsupportedError, TrackInvalidError } from '../errors';
 import { mediaTrackToLocalTrack } from '../participant/publishUtils';
-import { audioDefaults, videoDefaults } from '../defaults';
 import LocalAudioTrack from './LocalAudioTrack';
 import type LocalTrack from './LocalTrack';
 import LocalVideoTrack from './LocalVideoTrack';
+import { Track } from './Track';
 import {
  AudioCaptureOptions,
  CreateLocalTracksOptions,
  ScreenShareCaptureOptions,
  VideoCaptureOptions,
  VideoPresets,
 } from './options';
-import { Track } from './Track';
 import { constraintsForOptions, mergeDefaultOptions } from './utils';
 
 /**