Merge pull request #97 from Peetee06/ref/restructure_project_for_sing…

…le_import Thank you. I will wait a few weeks if anything else comes up. If not then i will release this as 2.0.0
blackhorse-one · Mar 8, 2024 · 8fbaebb · 8fbaebb
2 parents 6e61a29 + 33c8a6d
commit 8fbaebb
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 51 deletions.
diff --git a/example/main.dart b/example/main.dart
@@ -1,9 +1,7 @@
 import 'dart:async';
 import 'dart:convert';
 
-import 'package:stomp_dart_client/stomp.dart';
-import 'package:stomp_dart_client/stomp_config.dart';
-import 'package:stomp_dart_client/stomp_frame.dart';
+import 'package:stomp_dart_client/stomp_dart_client.dart';
 
 void onConnect(StompFrame frame) {
   stompClient.subscribe(

diff --git a/lib/src/_connect_api.dart → lib/src/connect_api.dart b/lib/src/_connect_api.dart → lib/src/connect_api.dart
@@ -1,8 +1,9 @@
 import 'dart:async';
 
-import 'package:stomp_dart_client/stomp_config.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
+import 'stomp_config.dart';
+
 Future<WebSocketChannel> connect(StompConfig config) {
   throw UnsupportedError('No implementation of the connect api provided');
 }
diff --git a/lib/src/_connect_html.dart → lib/src/connect_html.dart b/lib/src/_connect_html.dart → lib/src/connect_html.dart
@@ -1,10 +1,11 @@
 import 'dart:async';
 import 'dart:html';
 
-import 'package:stomp_dart_client/stomp_config.dart';
 import 'package:web_socket_channel/html.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
+import 'stomp_config.dart';
+
 Future<WebSocketChannel> connect(StompConfig config) {
   final completer = Completer<HtmlWebSocketChannel>();
   final webSocket = WebSocket(config.connectUrl)

diff --git a/lib/src/_connect_io.dart → lib/src/connect_io.dart b/lib/src/_connect_io.dart → lib/src/connect_io.dart
@@ -1,10 +1,11 @@
 import 'dart:async';
 import 'dart:io';
 
-import 'package:stomp_dart_client/stomp_config.dart';
 import 'package:web_socket_channel/io.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
+import 'stomp_config.dart';
+
 Future<WebSocketChannel> connect(StompConfig config) async {
   try {
     var webSocket = WebSocket.connect(

diff --git a/lib/parser.dart → lib/src/parser.dart b/lib/parser.dart → lib/src/parser.dart
@@ -1,4 +1,4 @@
-import 'package:stomp_dart_client/stomp_frame.dart';
+import 'stomp_frame.dart';
 
 abstract class Parser {
   late bool escapeHeaders;

diff --git a/lib/sock_js/sock_js_parser.dart → lib/src/sock_js/sock_js_parser.dart b/lib/sock_js/sock_js_parser.dart → lib/src/sock_js/sock_js_parser.dart
@@ -1,9 +1,9 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:stomp_dart_client/parser.dart';
-import 'package:stomp_dart_client/stomp_frame.dart';
-import 'package:stomp_dart_client/stomp_parser.dart';
+import '../parser.dart';
+import '../stomp_frame.dart';
+import '../stomp_parser.dart';
 
 class SockJSParser implements Parser {
   SockJSParser({

diff --git a/lib/sock_js/sock_js_utils.dart → lib/src/sock_js/sock_js_utils.dart b/lib/sock_js/sock_js_utils.dart → lib/src/sock_js/sock_js_utils.dart
diff --git a/lib/stomp.dart → lib/src/stomp.dart b/lib/stomp.dart → lib/src/stomp.dart
@@ -1,9 +1,9 @@
 import 'dart:async';
 import 'dart:typed_data';
 
-import 'package:stomp_dart_client/stomp_config.dart';
-import 'package:stomp_dart_client/stomp_exception.dart';
-import 'package:stomp_dart_client/stomp_handler.dart';
+import 'stomp_config.dart';
+import 'stomp_exception.dart';
+import 'stomp_handler.dart';
 
 class StompClient {
   StompClient({required this.config});

diff --git a/lib/stomp_config.dart → lib/src/stomp_config.dart b/lib/stomp_config.dart → lib/src/stomp_config.dart
@@ -1,7 +1,7 @@
 import 'dart:async';
 
-import 'package:stomp_dart_client/sock_js/sock_js_utils.dart';
-import 'package:stomp_dart_client/stomp_frame.dart';
+import 'sock_js/sock_js_utils.dart';
+import 'stomp_frame.dart';
 
 typedef StompFrameCallback = void Function(StompFrame);
 typedef StompBeforeConnectCallback = Future<void> Function();

diff --git a/lib/stomp_exception.dart → lib/src/stomp_exception.dart b/lib/stomp_exception.dart → lib/src/stomp_exception.dart
diff --git a/lib/stomp_frame.dart → lib/src/stomp_frame.dart b/lib/stomp_frame.dart → lib/src/stomp_frame.dart
diff --git a/lib/stomp_handler.dart → lib/src/stomp_handler.dart b/lib/stomp_handler.dart → lib/src/stomp_handler.dart
@@ -2,17 +2,18 @@ import 'dart:async';
 import 'dart:math';
 import 'dart:typed_data';
 
-import 'package:stomp_dart_client/parser.dart';
-import 'package:stomp_dart_client/sock_js/sock_js_parser.dart';
-import 'package:stomp_dart_client/stomp_config.dart';
-import 'package:stomp_dart_client/stomp_exception.dart';
-import 'package:stomp_dart_client/stomp_frame.dart';
-import 'package:stomp_dart_client/stomp_parser.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
-import 'src/_connect_api.dart'
-    if (dart.library.html) 'src/_connect_html.dart'
-    if (dart.library.io) 'src/_connect_io.dart' as platform;
+import 'parser.dart';
+import 'sock_js/sock_js_parser.dart';
+import 'stomp_config.dart';
+import 'stomp_exception.dart';
+import 'stomp_frame.dart';
+import 'stomp_parser.dart';
+
+import 'connect_api.dart'
+    if (dart.library.html) 'connect_html.dart'
+    if (dart.library.io) 'connect_io.dart' as platform;
 
 typedef StompUnsubscribe = void Function({
   Map<String, String>? unsubscribeHeaders,

diff --git a/lib/stomp_parser.dart → lib/src/stomp_parser.dart b/lib/stomp_parser.dart → lib/src/stomp_parser.dart
@@ -3,9 +3,9 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:stomp_dart_client/parser.dart';
-import 'package:stomp_dart_client/stomp_config.dart';
-import 'package:stomp_dart_client/stomp_frame.dart';
+import 'stomp_config.dart';
+import 'stomp_frame.dart';
+import 'parser.dart';
 
 typedef _ParseByteFunction = void Function(int);
 

diff --git a/lib/stomp_dart_client.dart b/lib/stomp_dart_client.dart
@@ -0,0 +1,9 @@
+export 'src/parser.dart';
+export 'src/stomp_config.dart';
+export 'src/stomp_exception.dart';
+export 'src/stomp_frame.dart';
+export 'src/stomp_handler.dart';
+export 'src/stomp_parser.dart';
+export 'src/stomp.dart';
+export 'src/sock_js/sock_js_parser.dart';
+export 'src/sock_js/sock_js_utils.dart';
diff --git a/test/sock_js_parser_test.dart b/test/sock_js_parser_test.dart
@@ -1,7 +1,6 @@
 import 'dart:convert';
 
-import 'package:stomp_dart_client/sock_js/sock_js_parser.dart';
-import 'package:stomp_dart_client/stomp_frame.dart';
+import 'package:stomp_dart_client/stomp_dart_client.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/sock_js_utils_test.dart b/test/sock_js_utils_test.dart
@@ -1,4 +1,4 @@
-import 'package:stomp_dart_client/sock_js/sock_js_utils.dart';
+import 'package:stomp_dart_client/stomp_dart_client.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/stomp_config_test.dart b/test/stomp_config_test.dart
@@ -3,10 +3,11 @@ import 'dart:async';
 import 'package:test/test.dart';
 import 'package:web_socket_channel/web_socket_channel.dart';
 
-import 'package:stomp_dart_client/stomp_config.dart';
-import 'package:stomp_dart_client/src/_connect_api.dart'
-    if (dart.library.html) '../lib/src/_connect_html.dart'
-    if (dart.library.io) '../lib/src/_connect_io.dart' as platform;
+import 'package:stomp_dart_client/stomp_dart_client.dart';
+import 'package:stomp_dart_client/src/connect_api.dart'
+    if (dart.library.html) 'package:stomp_dart_client/src/connect_html.dart'
+    if (dart.library.io) 'package:stomp_dart_client/src/connect_io.dart'
+    as platform;
 
 void main() {
   group('StompConfig', () {

diff --git a/test/stomp_handler_test.dart b/test/stomp_handler_test.dart
@@ -1,9 +1,6 @@
 import 'dart:async';
 
-import 'package:stomp_dart_client/stomp_config.dart';
-import 'package:stomp_dart_client/stomp_exception.dart';
-import 'package:stomp_dart_client/stomp_frame.dart';
-import 'package:stomp_dart_client/stomp_handler.dart';
+import 'package:stomp_dart_client/stomp_dart_client.dart';
 import 'package:stream_channel/stream_channel.dart';
 import 'package:test/test.dart';
 
@@ -22,7 +19,7 @@ void main() {
         import 'dart:async';
         import 'dart:convert';
         import 'package:web_socket_channel/io.dart';
-        import 'package:stomp_dart_client/stomp_parser.dart';
+        import 'package:stomp_dart_client/stomp_dart_client.dart';
         import 'package:stream_channel/stream_channel.dart';
 
         Future<void> hybridMain(StreamChannel channel) async {

diff --git a/test/stomp_parser_test.dart b/test/stomp_parser_test.dart
@@ -1,8 +1,7 @@
 import 'dart:convert';
 import 'dart:typed_data';
 
-import 'package:stomp_dart_client/stomp_frame.dart';
-import 'package:stomp_dart_client/stomp_parser.dart';
+import 'package:stomp_dart_client/stomp_dart_client.dart';
 import 'package:test/test.dart';
 
 void main() {

diff --git a/test/stomp_test.dart b/test/stomp_test.dart
@@ -1,10 +1,6 @@
 import 'dart:async';
 
-import 'package:stomp_dart_client/stomp.dart';
-import 'package:stomp_dart_client/stomp_config.dart';
-import 'package:stomp_dart_client/stomp_exception.dart';
-import 'package:stomp_dart_client/stomp_frame.dart';
-import 'package:stomp_dart_client/stomp_handler.dart';
+import 'package:stomp_dart_client/stomp_dart_client.dart';
 import 'package:stream_channel/stream_channel.dart';
 import 'package:test/test.dart';
 
@@ -21,9 +17,9 @@ void main() {
         import 'dart:async';
         import 'dart:convert';
         import 'package:web_socket_channel/io.dart';
-        import 'package:stomp_dart_client/stomp_parser.dart';
+        import 'package:stomp_dart_client/stomp_dart_client.dart';
         import 'package:stream_channel/stream_channel.dart';
-        
+
         Future<void> hybridMain(StreamChannel channel) async {
           final server = await HttpServer.bind("localhost", 0);
           server.transform(WebSocketTransformer()).listen((webSocket) {
@@ -40,7 +36,7 @@ void main() {
                       "MESSAGE\nsubscription:${frame.headers['id']}\nmessage-id:123\ndestination:/foo\n\nThis is the message body\x00");
                 } else if (frame.headers['destination'] == '/bar') {
                   webSocketChannel.sink.add(utf8.encode(
-                      "MESSAGE\nsubscription:${frame.headers['id']}\nmessage-id:123\ndestination:/bar\n\nThis is the message body\x00"));     
+                      "MESSAGE\nsubscription:${frame.headers['id']}\nmessage-id:123\ndestination:/bar\n\nThis is the message body\x00"));
                 }
               } else if (frame.command == 'UNSUBSCRIBE' ||
                   frame.command == 'SEND') {
@@ -94,9 +90,9 @@ void main() {
         import 'dart:async';
         import 'dart:convert';
         import 'package:web_socket_channel/io.dart';
-        import 'package:stomp_dart_client/stomp_parser.dart';
+        import 'package:stomp_dart_client/stomp_dart_client.dart';
         import 'package:stream_channel/stream_channel.dart';
-        
+
         Future<void> hybridMain(StreamChannel channel) async {
           final server = await HttpServer.bind("localhost", 0);
           server.transform(WebSocketTransformer()).listen((webSocket) {