Apply various improvements

automate/__main__.py

@@ -48,11 +48,6 @@ def replace_text_in_file(filepath: str, change_from: str, change_to: str):
     os.remove("Cargo.toml")
 
     # Enable the web target, since it's not enabled by default.
-    replace_text_in_file(
-        "native/hub/src/lib.rs",
-        "use tokio;",
-        "// use tokio;",
-    )
     replace_text_in_file(
         "native/hub/src/lib.rs",
         "// use tokio_with_wasm::alias as tokio;",
@@ -102,11 +97,6 @@ def replace_text_in_file(filepath: str, change_from: str, change_to: str):
     os.remove("Cargo.toml")
 
     # Enable the web target, since it's not enabled by default.
-    replace_text_in_file(
-        "native/hub/src/lib.rs",
-        "use tokio;",
-        "// use tokio;",
-    )
     replace_text_in_file(
         "native/hub/src/lib.rs",
         "// use tokio_with_wasm::alias as tokio;",

documentation/docs/frequently-asked-questions.md

@@ -203,7 +203,7 @@ message MyUniqueOutput {
 
 ```dart title="lib/main.dart"
 import 'dart:async';
-import 'package:example_app/messages/tutorial_resource.pb.dart';
+import 'package:example_app/messages/exports.dart';
 
 var currentInteractionId = 0;
 final myUniqueOutputs = Map<int, Completer<MyUniqueOutput>>();
@@ -218,7 +218,7 @@ void main() async {
 
 ```dart title="lib/main.dart"
 import 'dart:async';
-import 'package:example_app/messages/tutorial_resource.pb.dart';
+import 'package:example_app/messages/exports.dart';
 
 onPressed: () async {
   final completer = Completer<MyUniqueOutput>();
@@ -233,9 +233,9 @@ onPressed: () async {
 ```
 
 ```rust title="native/hub/src/sample_functions.rs"
-pub async fn respond() {
-    use messages::tutorial_resource::*;
+use crate::messages::*;
 
+pub async fn respond() {
     let receiver = MyUniqueInput::get_dart_signal_receiver();
     while let Some(dart_signal) = receiver.recv().await {
         let my_unique_input = dart_signal.message;
@@ -312,7 +312,7 @@ Failed to load dynamic library 'libhub.so': libhub.so: cannot open shared object
 In this case, you can specify a path that points to the compiled Rust library. Simply provide a string path to your dynamic library file.
 
 ```dart title="lib/main.dart"
-import './messages/generated.dart';
+import './messages/exports.dart';
 
 async void main() {
   await initializeRust(compiledLibPath: "/path/to/library/libhub.so");

documentation/docs/tutorial.md

@@ -37,7 +37,7 @@ rinf message
 Create a button widget in Dart that accepts the user input.
 
 ```dart title="lib/main.dart"
-import 'package:test_app/messages/tutorial_messages.pb.dart';
+import 'package:test_app/messages/exports.dart';
 
 child: Column(
   mainAxisAlignment: MainAxisAlignment.center,
@@ -59,12 +59,10 @@ Let's listen to this message in Rust. This simple function will add one to each
 
 ```rust title="native/hub/src/tutorial_functions.rs"
 use crate::common::*;
-use crate::messages;
+use crate::messages::*;
 use rinf::debug_print;
 
 pub async fn calculate_precious_data() {
-    use messages::tutorial_messages::*;
-
     let receiver = MyPreciousData::get_dart_signal_receiver(); // GENERATED
     while let Some(dart_signal) = receiver.recv().await {
         let my_precious_data = dart_signal.message;
@@ -124,12 +122,10 @@ tokio = { version = "1", features = ["sync", "rt", "time"] }
 ```
 
 ```rust title="native/hub/src/tutorial_functions.rs"
-use crate::messages;
+use crate::messages::*;
 use std::time::Duration;
 
 pub async fn stream_amazing_number() {
-    use messages::tutorial_messages::*;
-
     let mut current_number: i32 = 1;
     loop {
         tokio::time::sleep(Duration::from_secs(1)).await;
@@ -150,7 +146,8 @@ async fn main() {
 Finally, receive the signals in Dart with `StreamBuilder` and rebuild the widget accordingly.
 
 ```dart title="lib/main.dart"
-import 'package:test_app/messages/tutorial_messages.pb.dart';
+import 'package:test_app/messages/exports.dart';
+
 children: [
   StreamBuilder(
     stream: MyAmazingNumber.rustSignalStream, // GENERATED
@@ -187,7 +184,7 @@ rinf message
 ```
 
 ```dart title="lib/main.dart"
-import 'package:test_app/messages/tutorial_messages.pb.dart';
+import 'package:test_app/messages/exports.dart';
 
 children: [
   StreamBuilder(
@@ -213,11 +210,9 @@ children: [
 
 ```rust title="native/hub/src/tutorial_functions.rs"
 use crate::common::*;
-use crate::messages;
+use crate::messages::*;
 
 pub async fn tell_treasure() {
-    use messages::tutorial_messages::*;
-
     let mut current_value: i32 = 1;
 
     let receiver = MyTreasureInput::get_dart_signal_receiver(); // GENERATED

flutter_package/bin/src/helpers.dart

@@ -148,7 +148,7 @@ please refer to Rinf's [documentation](https://rinf.cunarist.com).
   if (await mainFile.exists()) {
     await Process.run('dart', ['format', './lib/main.dart']);
     var mainText = await mainFile.readAsString();
-    if (!mainText.contains('messages/generated.dart')) {
+    if (!mainText.contains('messages/exports.dart')) {
       final lines = mainText.split("\n");
       final lastImportIndex = lines.lastIndexWhere(
         (line) => line.startsWith('import '),
@@ -159,7 +159,7 @@ please refer to Rinf's [documentation](https://rinf.cunarist.com).
       );
       lines.insert(
         lastImportIndex + 2,
-        "import './messages/generated.dart';",
+        "import './messages/exports.dart';",
       );
       mainText = lines.join("\n");
     }

flutter_package/bin/src/message.dart

@@ -139,9 +139,11 @@ Future<void> generateMessageCode({
   for (final entry in resourcesInFolders.entries) {
     final subPath = entry.key;
     final resourceNames = entry.value;
-    final modRsLines = resourceNames.map((resourceName) {
-      return 'pub mod $resourceName;';
-    }).toList();
+    final modRsLines = <String>[];
+    for (final resourceName in resourceNames) {
+      modRsLines.add('pub mod $resourceName;');
+      modRsLines.add('pub use $resourceName::*;');
+    }
     for (final otherSubPath in resourcesInFolders.keys) {
       if (otherSubPath != subPath && otherSubPath.contains(subPath)) {
         final subPathSplitted = subPath
@@ -173,10 +175,12 @@ Future<void> generateMessageCode({
         }
         final childName = otherSubPathSplitted.last;
         modRsLines.add('pub mod $childName;');
+        modRsLines.add('pub use $childName::*;');
       }
     }
     if (subPath == "/") {
       modRsLines.add("pub mod generated;");
+      modRsLines.add("pub use generated::*;");
     }
     final modRsContent = modRsLines.join('\n');
     await File.fromUri(rustOutputPath.join(subPath).join('mod.rs'))
@@ -232,6 +236,23 @@ Future<void> generateMessageCode({
     }
   }
 
+  // Generate `exports.dart` for `messages` module in Dart.
+  final exportsDartLines = <String>[];
+  exportsDartLines.add("export './generated.dart';");
+  for (final entry in resourcesInFolders.entries) {
+    var subPath = entry.key;
+    if (subPath == "/") {
+      subPath = "";
+    }
+    final resourceNames = entry.value;
+    for (final resourceName in resourceNames) {
+      exportsDartLines.add("export './$subPath$resourceName.pb.dart';");
+    }
+  }
+  final exportsDartContent = exportsDartLines.join('\n');
+  await File.fromUri(dartOutputPath.join('exports.dart'))
+      .writeAsString(exportsDartContent);
+
   // Prepare communication channels between Dart and Rust.
   for (final entry in markedMessagesAll.entries) {
     final subPath = entry.key;
@@ -268,9 +289,9 @@ import 'package:rinf/rinf.dart';
 
 use prost::Message;
 use rinf::{
-    debug_print, message_channel, send_rust_signal,
-    DartSignal, MessageReceiver, MessageSender,
-    RinfError,
+    debug_print, send_rust_signal, signal_channel,
+    DartSignal, RinfError, SignalReceiver,
+    SignalSender,
 };
 use std::sync::LazyLock;
 
@@ -289,15 +310,15 @@ use std::sync::LazyLock;
           await insertTextToFile(
             rustPath,
             '''
-type ${messageName}Cell = LazyLock<(
-    MessageSender<DartSignal<${normalizePascal(messageName)}>>,
-    MessageReceiver<DartSignal<${normalizePascal(messageName)}>>,
+type ${messageName}Channel = LazyLock<(
+    SignalSender<DartSignal<${normalizePascal(messageName)}>>,
+    SignalReceiver<DartSignal<${normalizePascal(messageName)}>>,
 )>;
-pub static ${snakeName.toUpperCase()}_CHANNEL: ${messageName}Cell =
-    LazyLock::new(message_channel);
+pub static ${snakeName.toUpperCase()}_CHANNEL: ${messageName}Channel =
+    LazyLock::new(signal_channel);
 
 impl ${normalizePascal(messageName)} {
-    pub fn get_dart_signal_receiver() -> MessageReceiver<DartSignal<Self>> {
+    pub fn get_dart_signal_receiver() -> SignalReceiver<DartSignal<Self>> {
         ${snakeName.toUpperCase()}_CHANNEL.1.clone()
     }
 }
@@ -307,7 +328,7 @@ impl ${normalizePascal(messageName)} {
             await insertTextToFile(
               dartPath,
               '''
-extension ${messageName}Extension on $messageName{
+extension ${messageName}Ext on $messageName{
   void sendSignalToRust() {
     sendDartSignal(
       ${markedMessage.id},
@@ -324,7 +345,7 @@ extension ${messageName}Extension on $messageName{
           await insertTextToFile(
             dartPath,
             '''
-extension ${messageName}Extension on $messageName{
+extension ${messageName}Ext on $messageName{
   void sendSignalToRust(Uint8List binary) {
     sendDartSignal(
       ${markedMessage.id},
@@ -402,7 +423,7 @@ impl ${normalizePascal(messageName)} {
 #![allow(unused_mut)]
 
 use prost::Message;
-use rinf::{debug_print, message_channel, DartSignal, RinfError};
+use rinf::{debug_print, signal_channel, DartSignal, RinfError};
 use std::collections::HashMap;
 use std::error::Error;
 use std::sync::OnceLock;

flutter_package/example/lib/main.dart

@@ -1,9 +1,7 @@
 import 'dart:ui';
 import 'package:flutter/material.dart';
 import 'package:rinf/rinf.dart';
-import './messages/generated.dart';
-import './messages/counter_number.pb.dart';
-import './messages/fractal_art.pb.dart';
+import './messages/exports.dart';
 
 void main() async {
   await initializeRust(assignRustSignal);

flutter_package/example/native/hub/src/lib.rs

@@ -5,7 +5,6 @@ mod common;
 mod messages;
 mod sample_functions;
 
-// use tokio;
 use common::*;
 use tokio_with_wasm::alias as tokio;
 

flutter_package/example/native/hub/src/sample_functions.rs

@@ -1,7 +1,7 @@
 //! This crate is written for Rinf demonstrations.
 
 use crate::common::*;
-use crate::messages;
+use crate::messages::*;
 use crate::tokio;
 use rinf::debug_print;
 use std::time::Duration;
@@ -14,8 +14,6 @@ static IS_DEBUG_MODE: bool = false;
 
 // Business logic for the counter widget.
 pub async fn tell_numbers() {
-    use messages::counter_number::*;
-
     let mut vector = Vec::new();
 
     // Stream getter is generated from a marked Protobuf message.
@@ -44,9 +42,6 @@ pub async fn tell_numbers() {
 
 // Business logic for the fractal image.
 pub async fn stream_fractal() {
-    use messages::counter_number::*;
-    use messages::fractal_art::*;
-
     let mut current_scale: f64 = 1.0;
 
     let (sender, mut receiver) = tokio::sync::mpsc::channel(5);
@@ -103,13 +98,13 @@ pub async fn stream_fractal() {
 // A dummy function that uses sample messages to eliminate warnings.
 #[allow(dead_code)]
 async fn use_messages() {
-    use messages::sample_folder::sample_file::*;
     let _ = SampleInput::get_dart_signal_receiver();
     SampleOutput {
         kind: 3,
         oneof_input: Some(sample_output::OneofInput::Age(25)),
     }
     .send_signal_to_dart();
+    let _ = DeeperDummy {};
 }
 
 // Business logic for testing various crates.

flutter_package/template/native/hub/src/lib.rs

@@ -5,7 +5,7 @@ mod common;
 mod messages;
 
 use crate::common::*;
-use tokio; // Comment this line to target the web.
+use crate::messages::*;
 // use tokio_with_wasm::alias as tokio; // Uncomment this line to target the web.
 
 rinf::write_interface!();
@@ -29,8 +29,6 @@ async fn main() -> Result<()> {
 }
 
 async fn communicate() {
-    use messages::basic::*;
-
     // Send signals to Dart like below.
     SmallNumber { number: 7 }.send_signal_to_dart();