Simplifying code. #14

Author: caduandrade

lib/simdart.dart

@@ -1,8 +1,7 @@
 export 'src/event.dart';
 export 'src/interval.dart';
 export 'src/observable.dart';
-export 'src/resources_context.dart';
-export 'src/resources.dart';
+export 'src/resources.dart' hide ResourcesFactory;
 export 'src/simdart.dart' hide SimDartHelper;
 export 'src/simulation_track.dart';
 export 'src/start_time_handling.dart';

lib/src/internal/event_action.dart

@@ -3,11 +3,9 @@ import 'dart:async';
 import 'package:meta/meta.dart';
 import 'package:simdart/src/event.dart';
 import 'package:simdart/src/internal/completer_action.dart';
-import 'package:simdart/src/internal/resource.dart';
-import 'package:simdart/src/internal/resources_context_impl.dart';
 import 'package:simdart/src/internal/time_action.dart';
 import 'package:simdart/src/interval.dart';
-import 'package:simdart/src/resources_context.dart';
+import 'package:simdart/src/resources.dart';
 import 'package:simdart/src/sim_context.dart';
 import 'package:simdart/src/sim_counter.dart';
 import 'package:simdart/src/sim_num.dart';
@@ -35,13 +33,18 @@ class EventAction extends TimeAction implements SimContext {
   final SimDart sim;
 
   @override
-  late final ResourcesContext resources = ResourcesContextImpl(sim, this);
+  late final ResourcesContext resources = ResourcesFactory.context(sim, this);
 
   @override
   int get now => sim.now;
 
   /// Internal handler for resuming a waiting event.
   EventCompleter? _eventCompleter;
+  EventCompleter? get eventCompleter => _eventCompleter;
+
+  void buildCompleter() {
+    _eventCompleter = EventCompleter(event: this);
+  }
 
   @override
   void execute() {
@@ -95,53 +98,6 @@ class EventAction extends TimeAction implements SimContext {
     SimDartHelper.scheduleNextAction(sim: sim);
 
     await _eventCompleter!.future;
-    _eventCompleter = null;
-  }
-
-  Future<void> acquireResource(String id) async {
-    if (_eventCompleter != null) {
-      SimDartHelper.error(
-          sim: sim,
-          msg:
-              "This event should be waiting for the resource to be released. Did you forget to use 'await'?");
-      return;
-    }
-    Resource? resource = SimDartHelper.getResource(sim: sim, resourceId: id);
-    if (resource != null) {
-      bool acquired = resource.acquire(this);
-      if (!acquired) {
-        if (sim.includeTracks) {
-          SimDartHelper.addSimulationTrack(
-              sim: sim, eventName: eventName, status: Status.yielded);
-        }
-        _eventCompleter = EventCompleter(event: this);
-        resource.waiting.add(this);
-        SimDartHelper.scheduleNextAction(sim: sim);
-        await _eventCompleter!.future;
-        _eventCompleter = null;
-        return await acquireResource(id);
-      }
-    }
-  }
-
-  void releaseResource(String id) {
-    Resource? resource = SimDartHelper.getResource(sim: sim, resourceId: id);
-    if (resource != null) {
-      if (resource.release(sim, this)) {
-        if (resource.waiting.isNotEmpty) {
-          //resource.waiting.removeAt(0).call();
-          EventAction other = resource.waiting.removeAt(0);
-          // Schedule a complete to resume this event in the future.
-          SimDartHelper.addAction(
-              sim: sim,
-              action: CompleterAction(
-                  start: sim.now,
-                  complete: other._eventCompleter!.complete,
-                  order: other.order));
-          SimDartHelper.scheduleNextAction(sim: sim);
-        }
-      }
-    }
   }
 
   @override

lib/src/internal/resources_context_impl.dart

@@ -1,4 +1,15 @@
-abstract class Resources {
+import 'package:meta/meta.dart';
+import 'package:simdart/src/internal/completer_action.dart';
+import 'package:simdart/src/internal/event_action.dart';
+import 'package:simdart/src/internal/resource.dart';
+import 'package:simdart/src/simdart.dart';
+import 'package:simdart/src/simulation_track.dart';
+
+class Resources {
+  Resources._(SimDart sim) : _sim = sim;
+
+  final SimDart _sim;
+
   /// Creates a resource with limited capacity.
   ///
   /// This method adds a resource with the specified capacity.
@@ -7,11 +18,101 @@ abstract class Resources {
   ///
   /// - [id]: The unique identifier of the resource (required).
   /// - [capacity]: The maximum capacity of the resource. The default value is 1.
-  void limited({required String id, int capacity = 1});
+  void limited({required String id, int capacity = 1}) {
+    SimDartHelper.addResource(
+        sim: _sim,
+        resourceId: id,
+        create: () => LimitedResource(id: id, capacity: capacity));
+  }
 
   /// Checks if a resource is available.
   ///
   /// - [id]: The id of the resource to check.
   /// - Returns: `true` if the resource is available, `false` otherwise.
-  bool isAvailable(String id);
+  bool isAvailable(String id) {
+    Resource? resource = SimDartHelper.getResource(sim: _sim, resourceId: id);
+    if (resource != null) {
+      return resource.isAvailable();
+    }
+    return false;
+  }
+}
+
+class ResourcesContext extends Resources {
+  ResourcesContext._(super.sim, EventAction event)
+      : _event = event,
+        super._();
+
+  final EventAction _event;
+
+  /// Tries to acquire a resource immediately.
+  ///
+  /// - [id]: The id of the resource to acquire.
+  /// - Returns: `true` if the resource was acquired, `false` otherwise.
+  bool tryAcquire(String id) {
+    Resource? resource = SimDartHelper.getResource(sim: _sim, resourceId: id);
+    if (resource != null) {
+      return resource.acquire(_event);
+    }
+    return false;
+  }
+
+  /// Acquires a resource, waiting if necessary until it becomes available.
+  ///
+  /// - [id]: The id of the resource to acquire.
+  /// - Returns: A [Future] that completes when the resource is acquired.
+  Future<void> acquire(String id) async {
+    if (_event.eventCompleter != null) {
+      SimDartHelper.error(
+          sim: _sim,
+          msg:
+              "This event should be waiting for the resource to be released. Did you forget to use 'await'?");
+      return;
+    }
+    Resource? resource = SimDartHelper.getResource(sim: _sim, resourceId: id);
+    if (resource != null) {
+      bool acquired = resource.acquire(_event);
+      if (!acquired) {
+        if (_sim.includeTracks) {
+          SimDartHelper.addSimulationTrack(
+              sim: _sim, eventName: _event.eventName, status: Status.yielded);
+        }
+        _event.buildCompleter();
+        resource.waiting.add(_event);
+        SimDartHelper.scheduleNextAction(sim: _sim);
+        await _event.eventCompleter!.future;
+        return await acquire(id);
+      }
+    }
+  }
+
+  /// Releases a previously acquired resource.
+  ///
+  /// - [id]: The id of the resource to release.
+  void release(String id) {
+    Resource? resource = SimDartHelper.getResource(sim: _sim, resourceId: id);
+    if (resource != null) {
+      if (resource.release(_sim, _event)) {
+        if (resource.waiting.isNotEmpty) {
+          EventAction other = resource.waiting.removeAt(0);
+          // Schedule a complete to resume this event in the future.
+          SimDartHelper.addAction(
+              sim: _sim,
+              action: CompleterAction(
+                  start: _sim.now,
+                  complete: other.eventCompleter!.complete,
+                  order: other.order));
+          SimDartHelper.scheduleNextAction(sim: _sim);
+        }
+      }
+    }
+  }
+}
+
+@internal
+class ResourcesFactory {
+  static Resources sim(SimDart sim) => Resources._(sim);
+
+  static ResourcesContext context(SimDart sim, EventAction event) =>
+      ResourcesContext._(sim, event);
 }

lib/src/internal/resources_impl.dart

@@ -1,5 +1,5 @@
 import 'package:simdart/src/internal/simdart_interface.dart';
-import 'package:simdart/src/resources_context.dart';
+import 'package:simdart/src/resources.dart';
 
 abstract interface class SimContext implements SimDartInterface {
   /// Pauses the execution of the event for the specified [delay] in simulation time.

lib/src/resources.dart

@@ -7,7 +7,6 @@ import 'package:simdart/src/event.dart';
 import 'package:simdart/src/internal/event_action.dart';
 import 'package:simdart/src/internal/repeat_event_action.dart';
 import 'package:simdart/src/internal/resource.dart';
-import 'package:simdart/src/internal/resources_impl.dart';
 import 'package:simdart/src/internal/simdart_interface.dart';
 import 'package:simdart/src/internal/time_action.dart';
 import 'package:simdart/src/interval.dart';
@@ -55,7 +54,7 @@ class SimDart implements SimDartInterface {
   /// Holds the resources in the simulator.
   final Map<String, Resource> _resources = {};
 
-  late final Resources resources = ResourcesImpl(this);
+  late final Resources resources = ResourcesFactory.sim(this);
 
   /// The instance of the random number generator used across the simulation.
   /// It is initialized once and reused to improve performance, avoiding the need to