feat: queued dispose system

arxdeus · Mar 4, 2025 · 7f26f89 · 7f26f89
1 parent d4aebb2
commit 7f26f89
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/packages/modulisto/lib/src/internal.dart b/packages/modulisto/lib/src/internal.dart
@@ -15,7 +15,8 @@ abstract class ModuleBase implements DisposerHolder {
 
   bool get isClosed;
 
-  abstract final Queue<Disposable> $linkedDisposables;
+  @override
+  abstract final Queue<FutureOr<void> Function()> $disposeQueue;
   abstract final Stream<RawUnitIntent> $intentStream;
   void $addIntent<T>(UnitIntent<T, Object?> intent);
 }
@@ -53,8 +54,12 @@ abstract class Attachable {
 
 abstract class DisposerHolder {
   @internal
-  List<void Function()> get $disposers;
+  Queue<FutureOr<void> Function()> get $disposeQueue;
 }
 
 @internal
-abstract class PipelineRef implements IntentHandler, DisposerHolder {}
+abstract class PipelineRef implements IntentHandler, DisposerHolder {
+  @override
+  @internal
+  Queue<FutureOr<void> Function()> get $disposeQueue;
+}
diff --git a/packages/modulisto/lib/src/module.dart b/packages/modulisto/lib/src/module.dart
@@ -4,7 +4,6 @@ import 'dart:collection';
 import 'package:meta/meta.dart';
 import 'package:modulisto/src/interfaces.dart';
 import 'package:modulisto/src/internal.dart';
-import 'package:modulisto/src/unit/pipeline/pipeline.dart';
 import 'package:modulisto/src/unit/trigger.dart';
 
 abstract base class Module extends ModuleBase implements Disposable, Named {
@@ -18,12 +17,13 @@ abstract base class Module extends ModuleBase implements Disposable, Named {
     module._lifecycle.init();
   }
 
-  @override
-  @internal
-  late final List<void Function()> $disposers = [];
-
   bool _isClosed = false;
 
+  @override
+  @internal
+  @nonVirtual
+  @visibleForTesting
+  late final Queue<FutureOr<void> Function()> $disposeQueue = Queue();
   late final _lifecycle = (
     init: Trigger<()>(this),
     dispose: Trigger<()>(this),
@@ -32,21 +32,15 @@ abstract base class Module extends ModuleBase implements Disposable, Named {
   @nonVirtual
   ModuleLifecycle get lifecycle => _lifecycle;
 
-  @override
-  @protected
-  @visibleForTesting
-  @nonVirtual
-  late final Queue<PipelineUnit> $linkedDisposables = Queue();
-
   final StreamController<RawUnitIntent> _intentController = StreamController.broadcast();
 
   @override
   Future<void> dispose() async {
     _lifecycle.dispose();
     _isClosed = true;
 
-    for (final disposable in $linkedDisposables) {
-      await disposable.dispose();
+    for (final dispose in $disposeQueue) {
+      await dispose();
     }
     await _intentController.close();
   }

diff --git a/packages/modulisto/lib/src/unit/pipeline/linker/stream_linker.dart b/packages/modulisto/lib/src/unit/pipeline/linker/stream_linker.dart
@@ -17,7 +17,7 @@ class StreamPipelineLinker<T> implements PipelineLinker<Stream<T>, T> {
   @override
   void bind(FutureOr<void> Function(PipelineContext context, T value) handler) {
     final sub = _stream.listen(pipelineRef.$handle(_stream, handler));
-    pipelineRef.$disposers.add(sub.cancel);
+    pipelineRef.$disposeQueue.add(sub.cancel);
   }
 
   @override

diff --git a/packages/modulisto/lib/src/unit/pipeline/linker/unit_linker.dart b/packages/modulisto/lib/src/unit/pipeline/linker/unit_linker.dart
@@ -18,7 +18,6 @@ class UnitPipelineLinker<T> implements PipelineLinker<Unit<T>, T> {
   void bind(FutureOr<void> Function(PipelineContext context, T value) handler) {
     final callback = pipelineRef.$handle(_unit, handler);
     _unit.addListener(callback);
-    pipelineRef.$disposers.add(_unit.dispose);
   }
 
   @override

diff --git a/packages/modulisto/lib/src/unit/pipeline/type/async_pipeline.dart b/packages/modulisto/lib/src/unit/pipeline/type/async_pipeline.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:collection';
 
 import 'package:meta/meta.dart';
 import 'package:modulisto/src/interfaces.dart';
@@ -33,7 +34,7 @@ final class AsyncPipeline extends PipelineUnit implements AsyncPipelineRef, Inte
   late final List<Future<void>> _pendingEvents = [];
   @override
   @internal
-  late final List<void Function()> $disposers = [];
+  late final Queue<void Function()> $disposeQueue = Queue();
 
   late final Stream<RawPipelineIntent> _intentStream = _transformer(
     module.$intentStream.whereType<RawPipelineIntent>().where((intent) => intent.source == this),
@@ -48,7 +49,7 @@ final class AsyncPipeline extends PipelineUnit implements AsyncPipelineRef, Inte
   void attachToModule(ModuleBase module) {
     pipelineRegister(this);
     _sub = _intentStream.listen(null);
-    module.$linkedDisposables.addFirst(this);
+    module.$disposeQueue.addFirst(dispose);
   }
 
   @override
@@ -83,7 +84,7 @@ final class AsyncPipeline extends PipelineUnit implements AsyncPipelineRef, Inte
     await Future.wait(_pendingEvents);
     await _sub?.cancel();
 
-    for (final disposer in $disposers) {
+    for (final disposer in $disposeQueue) {
       disposer();
     }
     super.dispose();

diff --git a/packages/modulisto/lib/src/unit/pipeline/type/sync_pipeline.dart b/packages/modulisto/lib/src/unit/pipeline/type/sync_pipeline.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:collection';
 
 import 'package:meta/meta.dart';
 import 'package:modulisto/src/interfaces.dart';
@@ -25,7 +26,7 @@ final class SyncPipeline extends PipelineUnit implements SyncPipelineRef, Intent
 
   @override
   @internal
-  late final List<void Function()> $disposers = [];
+  late final Queue<void Function()> $disposeQueue = Queue();
 
   @override
   void Function(T value) $handle<T>(
@@ -37,13 +38,13 @@ final class SyncPipeline extends PipelineUnit implements SyncPipelineRef, Intent
   @override
   @protected
   void attachToModule(ModuleBase module) {
-    module.$linkedDisposables.addLast(this);
+    module.$disposeQueue.addLast(dispose);
     pipelineRegister(this);
   }
 
   @override
   void dispose() {
-    for (final disposer in $disposers) {
+    for (final disposer in $disposeQueue) {
       disposer();
     }
     super.dispose();