Fix imports

bin/xterm_bench.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:xterm/core/terminal.dart';
+import 'package:xterm/src/terminal.dart';
 
 class Test extends StatelessWidget {
   const Test({Key? key}) : super(key: key);

lib/core.dart

@@ -1,2 +1,2 @@
-export 'src/core/terminal.dart';
-export 'src/ui/terminal_view.dart';
+export 'src/terminal.dart';
+export 'src/terminal_view.dart';

lib/src/core/buffer/buffer.dart

@@ -1,14 +1,14 @@
 import 'dart:math' show max, min;
 
-import 'package:xterm/core/buffer/position.dart';
-import 'package:xterm/core/buffer/range.dart';
-import 'package:xterm/core/cursor.dart';
-import 'package:xterm/core/buffer/line.dart';
-import 'package:xterm/core/reflow.dart';
-import 'package:xterm/core/state.dart';
-import 'package:xterm/core/charset.dart';
-import 'package:xterm/utils/circular_list.dart';
-import 'package:xterm/utils/unicode_v11.dart';
+import 'package:xterm/src/core/buffer/position.dart';
+import 'package:xterm/src/core/buffer/range.dart';
+import 'package:xterm/src/core/cursor.dart';
+import 'package:xterm/src/core/buffer/line.dart';
+import 'package:xterm/src/core/reflow.dart';
+import 'package:xterm/src/core/state.dart';
+import 'package:xterm/src/core/charset.dart';
+import 'package:xterm/src/utils/circular_list.dart';
+import 'package:xterm/src/utils/unicode_v11.dart';
 
 class Buffer {
   final TerminalState terminal;

lib/src/core/buffer/line.dart

@@ -1,9 +1,9 @@
 import 'dart:math' show min;
 import 'dart:typed_data';
 
-import 'package:xterm/core/cell.dart';
-import 'package:xterm/core/cursor.dart';
-import 'package:xterm/utils/unicode_v11.dart';
+import 'package:xterm/src/core/cell.dart';
+import 'package:xterm/src/core/cursor.dart';
+import 'package:xterm/src/utils/unicode_v11.dart';
 
 const _cellSize = 4;
 

lib/src/core/buffer/position.dart

@@ -1,4 +1,4 @@
-import 'package:xterm/core/buffer/range.dart';
+import 'package:xterm/src/core/buffer/range.dart';
 
 class BufferPosition {
   final int x;

lib/src/core/buffer/range.dart

@@ -1,5 +1,5 @@
-import 'package:xterm/core/buffer/position.dart';
-import 'package:xterm/core/buffer/segment.dart';
+import 'package:xterm/src/core/buffer/position.dart';
+import 'package:xterm/src/core/buffer/segment.dart';
 
 class BufferRange {
   final BufferPosition begin;

lib/src/core/buffer/segment.dart

@@ -1,5 +1,5 @@
-import 'package:xterm/core/buffer/position.dart';
-import 'package:xterm/core/buffer/range.dart';
+import 'package:xterm/src/core/buffer/position.dart';
+import 'package:xterm/src/core/buffer/range.dart';
 
 class BufferSegment {
   /// The range that this segment belongs to.

lib/src/core/cell.dart

@@ -1,4 +1,4 @@
-import 'package:xterm/utils/hash_values.dart';
+import 'package:xterm/src/utils/hash_values.dart';
 
 class CellData {
   CellData({

lib/src/core/cursor.dart

@@ -1,4 +1,4 @@
-import 'package:xterm/core/cell.dart';
+import 'package:xterm/src/core/cell.dart';
 
 class CursorStyle {
   int foreground;

lib/src/core/escape/handler.dart

@@ -1,4 +1,4 @@
-import 'package:xterm/core/mouse.dart';
+import 'package:xterm/src/core/mouse.dart';
 
 abstract class EscapeHandler {
   void writeChar(int char);

lib/src/core/escape/parser.dart

@@ -1,10 +1,10 @@
-import 'package:xterm/core/color.dart';
-import 'package:xterm/core/mouse.dart';
-import 'package:xterm/core/escape/handler.dart';
-import 'package:xterm/utils/ascii.dart';
-import 'package:xterm/utils/byte_consumer.dart';
-import 'package:xterm/utils/char_code.dart';
-import 'package:xterm/utils/lookup_table.dart';
+import 'package:xterm/src/core/color.dart';
+import 'package:xterm/src/core/mouse.dart';
+import 'package:xterm/src/core/escape/handler.dart';
+import 'package:xterm/src/utils/ascii.dart';
+import 'package:xterm/src/utils/byte_consumer.dart';
+import 'package:xterm/src/utils/char_code.dart';
+import 'package:xterm/src/utils/lookup_table.dart';
 
 /// [EscapeParser] translates control characters and escape sequences into
 /// function calls that the terminal can handle.

lib/src/core/input/handler.dart

@@ -1,7 +1,7 @@
-import 'package:xterm/core/input/keys.dart';
-import 'package:xterm/core/input/keytab/keytab.dart';
-import 'package:xterm/utils/platform.dart';
-import 'package:xterm/core/state.dart';
+import 'package:xterm/src/core/input/keys.dart';
+import 'package:xterm/src/core/input/keytab/keytab.dart';
+import 'package:xterm/src/utils/platform.dart';
+import 'package:xterm/src/core/state.dart';
 
 class TerminalInputEvent {
   final TerminalKey key;

lib/src/core/input/keytab/keytab.dart

@@ -1,8 +1,8 @@
-import 'package:xterm/core/input/keys.dart';
-import 'package:xterm/core/input/keytab/keytab_default.dart';
-import 'package:xterm/core/input/keytab/keytab_parse.dart';
-import 'package:xterm/core/input/keytab/keytab_record.dart';
-import 'package:xterm/core/input/keytab/keytab_token.dart';
+import 'package:xterm/src/core/input/keys.dart';
+import 'package:xterm/src/core/input/keytab/keytab_default.dart';
+import 'package:xterm/src/core/input/keytab/keytab_parse.dart';
+import 'package:xterm/src/core/input/keytab/keytab_record.dart';
+import 'package:xterm/src/core/input/keytab/keytab_token.dart';
 
 class Keytab {
   Keytab({

lib/src/core/input/keytab/keytab_default.dart

@@ -1,5 +1,5 @@
-import 'package:xterm/core/input/keytab/keytab_parse.dart';
-import 'package:xterm/core/input/keytab/keytab_token.dart';
+import 'package:xterm/src/core/input/keytab/keytab_parse.dart';
+import 'package:xterm/src/core/input/keytab/keytab_token.dart';
 
 const kDefaultKeytab = r'''
 # [README.default.Keytab] Default Keyboard Table

lib/src/core/input/keytab/keytab_parse.dart

@@ -1,7 +1,7 @@
-import 'package:xterm/core/input/keytab/keytab.dart';
-import 'package:xterm/core/input/keytab/keytab_record.dart';
-import 'package:xterm/core/input/keytab/keytab_token.dart';
-import 'package:xterm/core/input/keytab/qt_keyname.dart';
+import 'package:xterm/src/core/input/keytab/keytab.dart';
+import 'package:xterm/src/core/input/keytab/keytab_record.dart';
+import 'package:xterm/src/core/input/keytab/keytab_token.dart';
+import 'package:xterm/src/core/input/keytab/qt_keyname.dart';
 
 class ParseError {}
 

lib/src/core/input/keytab/keytab_record.dart

@@ -1,5 +1,5 @@
-import 'package:xterm/core/input/keys.dart';
-import 'package:xterm/core/input/keytab/keytab_escape.dart';
+import 'package:xterm/src/core/input/keys.dart';
+import 'package:xterm/src/core/input/keytab/keytab_escape.dart';
 
 enum KeytabActionType {
   input,

lib/src/core/input/keytab/qt_keyname.dart

@@ -1,4 +1,4 @@
-import 'package:xterm/core/input/keys.dart';
+import 'package:xterm/src/core/input/keys.dart';
 
 /// See: https://doc.qt.io/qt-5/qt.html#Key-enum
 const qtKeynameMap = <String, TerminalKey>{

lib/src/core/reflow.dart

@@ -1,5 +1,5 @@
-import 'package:xterm/core/buffer/line.dart';
-import 'package:xterm/utils/circular_list.dart';
+import 'package:xterm/src/core/buffer/line.dart';
+import 'package:xterm/src/utils/circular_list.dart';
 
 class _LineBuilder {
   _LineBuilder([this._capacity = 80]) {

lib/src/core/state.dart

@@ -1,5 +1,5 @@
-import 'package:xterm/core/cursor.dart';
-import 'package:xterm/core/mouse.dart';
+import 'package:xterm/src/core/cursor.dart';
+import 'package:xterm/src/core/mouse.dart';
 
 abstract class TerminalState {
   int get viewWidth;

lib/src/ui/char_metrics.dart

@@ -1,6 +1,6 @@
 import 'dart:ui';
 
-import 'package:xterm/ui/terminal_text_style.dart';
+import 'package:xterm/src/ui/terminal_text_style.dart';
 
 Size calcCharMetrics(TerminalStyle style) {
   const test = 'mmmmmmmmmm';

lib/src/ui/controller.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:xterm/core/buffer/range.dart';
+import 'package:xterm/src/core/buffer/range.dart';
 
 class TerminalController with ChangeNotifier {
   BufferRange? _selection;

lib/src/ui/gesture/gesture_handler.dart

@@ -1,8 +1,8 @@
 import 'package:flutter/gestures.dart';
 import 'package:flutter/widgets.dart';
-import 'package:xterm/ui/terminal_view.dart';
-import 'package:xterm/ui/gesture/gesture_detector.dart';
-import 'package:xterm/ui/render.dart';
+import 'package:xterm/src/terminal_view.dart';
+import 'package:xterm/src/ui/gesture/gesture_detector.dart';
+import 'package:xterm/src/ui/render.dart';
 
 class TerminalGestureHandler extends StatefulWidget {
   const TerminalGestureHandler({

lib/src/ui/input_map.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/services.dart';
-import 'package:xterm/core/input/keys.dart';
+import 'package:xterm/src/core/input/keys.dart';
 
 final _idKeyMap = {
   LogicalKeyboardKey.hyper.keyId: TerminalKey.hyper,

lib/src/ui/palette_builder.dart

@@ -1,6 +1,6 @@
 import 'package:flutter/widgets.dart';
-import 'package:xterm/ui/terminal_theme.dart';
-import 'package:xterm/utils/lookup_table.dart';
+import 'package:xterm/src/ui/terminal_theme.dart';
+import 'package:xterm/src/utils/lookup_table.dart';
 
 class PaletteBuilder {
   final TerminalTheme theme;

lib/src/ui/render.dart

@@ -5,19 +5,19 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/rendering.dart';
 import 'package:flutter/scheduler.dart';
-import 'package:xterm/core/buffer/cell_flags.dart';
-import 'package:xterm/core/buffer/position.dart';
-import 'package:xterm/core/buffer/range.dart';
-import 'package:xterm/core/cell.dart';
-import 'package:xterm/core/buffer/line.dart';
-import 'package:xterm/core/terminal.dart';
-import 'package:xterm/ui/controller.dart';
-import 'package:xterm/ui/cursor_type.dart';
-import 'package:xterm/ui/palette_builder.dart';
-import 'package:xterm/ui/paragraph_cache.dart';
-import 'package:xterm/ui/terminal_size.dart';
-import 'package:xterm/ui/terminal_text_style.dart';
-import 'package:xterm/ui/terminal_theme.dart';
+import 'package:xterm/src/core/buffer/cell_flags.dart';
+import 'package:xterm/src/core/buffer/position.dart';
+import 'package:xterm/src/core/buffer/range.dart';
+import 'package:xterm/src/core/cell.dart';
+import 'package:xterm/src/core/buffer/line.dart';
+import 'package:xterm/src/terminal.dart';
+import 'package:xterm/src/ui/controller.dart';
+import 'package:xterm/src/ui/cursor_type.dart';
+import 'package:xterm/src/ui/palette_builder.dart';
+import 'package:xterm/src/ui/paragraph_cache.dart';
+import 'package:xterm/src/ui/terminal_size.dart';
+import 'package:xterm/src/ui/terminal_text_style.dart';
+import 'package:xterm/src/ui/terminal_theme.dart';
 
 typedef EditableRectCallback = void Function(Rect rect, Rect caretRect);
 

lib/src/ui/themes.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/widgets.dart';
-import 'package:xterm/ui/terminal_theme.dart';
+import 'package:xterm/src/ui/terminal_theme.dart';
 
 class TerminalThemes {
   static const defaultTheme = TerminalTheme(

lib/src/utils/debugger.dart

@@ -1,7 +1,7 @@
-import 'package:xterm/core/escape/handler.dart';
-import 'package:xterm/core/escape/parser.dart';
-import 'package:xterm/core/mouse.dart';
-import 'package:xterm/utils/observable.dart';
+import 'package:xterm/src/core/escape/handler.dart';
+import 'package:xterm/src/core/escape/parser.dart';
+import 'package:xterm/src/core/mouse.dart';
+import 'package:xterm/src/utils/observable.dart';
 
 class TerminalCommand {
   TerminalCommand(

lib/src/utils/debugger_view.dart

@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:xterm/utils/debugger.dart';
+import 'package:xterm/src/utils/debugger.dart';
 
 class TerminalDebuggerView extends StatefulWidget {
   const TerminalDebuggerView(

pubspec.lock

@@ -42,7 +42,7 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.9.0"
+    version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -112,7 +112,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
   charcode:
     dependency: transitive
     description:
@@ -133,7 +133,7 @@ packages:
       name: clock
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   code_builder:
     dependency: transitive
     description:
@@ -203,7 +203,7 @@ packages:
       name: fake_async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.0"
   file:
     dependency: transitive
     description:
@@ -311,21 +311,21 @@ packages:
       name: matcher
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.12.12"
+    version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.5"
+    version: "0.1.4"
   meta:
     dependency: "direct main"
     description:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.7.0"
   mime:
     dependency: transitive
     description:
@@ -360,7 +360,7 @@ packages:
       name: path
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.2"
+    version: "1.8.1"
   pedantic:
     dependency: transitive
     description:
@@ -470,7 +470,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.9.0"
+    version: "1.8.2"
   stack_trace:
     dependency: transitive
     description:
@@ -498,35 +498,35 @@ packages:
       name: string_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.0"
   test:
     dependency: "direct dev"
     description:
       name: test
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.21.4"
+    version: "1.21.1"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.12"
+    version: "0.4.9"
   test_core:
     dependency: transitive
     description:
       name: test_core
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.4.16"
+    version: "0.4.13"
   timing:
     dependency: transitive
     description:

test/next/core/buffer/line_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:xterm/core/buffer/line.dart';
+import 'package:xterm/src/core/buffer/line.dart';
 
 void main() {
   group('BufferLine', () {

test/next/core/reflow_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:xterm/core/terminal.dart';
+import 'package:xterm/src/terminal.dart';
 
 void main() {
   test('reflow() can reflow a single line', () {

test/util/circular_list_test.dart

@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:xterm/utils/circular_list.dart';
+import 'package:xterm/src/utils/circular_list.dart';
 
 void main() {
   group("CircularList Tests", () {