v2.0.0 (1): Refactor Arcane framework and enhance logging, theme, and auth services (#8)

* [UNTESTED] Fixes notifiers and adds some additional methods. Adds tests. Changes: // ArcaneEnvironment breaking: context.read<ArcaneEnvironment>() -> ArcaneEnvironment.of(context) breaking: context.read<ArcaneEnvironment>().state -> ArcaneEnvironment.of(context).environment; // Feature flag service added: reset() // Logging service added: registerInterface() added: unregisterInterfaces() added: unregisterAllInterfaces() // ArcaneReactiveTheme fixed: currentMode, dark, light now actually emit new values when changed added: getters for lightTheme, darkTheme, and systemTheme TODO: test systemTheme Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Logging service: - added: reset() - added: `skipAutodetection` option for module, method, and metadata - added: unregisterInterface() - Created FileAndLineNumber mixin Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Fix module/method/fileAndLineNumber calculations in logging service Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Fixes the reactive theme service to properly follow the system brightness Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Fixes tests and updates reactive theme Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Fixes broken tests Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Fixes bug with following/unfollowing system theme Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Re-add getters on ArcaneTheme Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Update example Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Added logStream to logger. Updated example code. Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Setting a theme style now automatically switches to that theme Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Added examples for feature flags Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Moved platform brightness checking from ArcaneApp to ArcaneThemeSwitcher, where it is more appropriate Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Attempt to correctly address "stable" version in .puro.json Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Another GH action attempt Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Add puro config to git :) Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * feat(framework): Overhauls framework core, services, and app integration for 2.0.0 (#5) * Made ArcaneTheme private (_ArcaneTheme) Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Updated changelog Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Fix updateShouldNotify on ArcaneServiceProvider Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Update service provider Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Put service locators in an extension Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Try using a mixin instead Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Remove 'of' and 'requiredOf' locators Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Re-add service locators. They should be called as: ArcaneService.of<MyService>(context) Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Renamed getters on ArcaneService Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Renamed serviceInstances => registeredServices and added a removeService method Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Broke up arcane service into separate files Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Added requiredServiceOfType getter on ArcaneServiceProvider Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Updated services section of the readme Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Updated example to add a services example Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Removed unused variable Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Update example documentation Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Update example Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Breaking up example into smaller widgets Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Remove bloc dependency Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Fixes the notifier for feature flags and updates the example Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Fixed a bug in the example Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Update ServiceProvider to make service instances optional Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Remove unnecessary notifyListeners calls Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Organize theme service Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Fix authentication interface and service methods for logout and login. * Fix DebugAuthInterface logout method Added environment key to ArcaneEnvironment constructor Renamed switchEnvironment parameter in ArcaneEnvironment constructor Bumped arcane_helper_utils dependency version * Enhance theme management with StreamBuilder for dynamic updates Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Add configuration files and update authentication service error handling - Introduced .vscode/settings.json and .vscode/launch.json for IDE configuration. - Updated DebugAuthInterface and ArcaneAuthenticationService to return const Result.ok() for consistency. - Added ArcaneTheme class for theme management. - Updated pubspec.yaml to change result_monad dependency version. - Modified authentication_service_test to return const Result.ok() in mock setups. Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Update dependency versions to use 'any' for arcane_helper_utils and arcane_analysis Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Remove unnecessary 'const' keyword from Result.ok calls in DebugAuthInterface methods Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Add 'const' keyword to Result.ok calls in DebugAuthInterface methods Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Enhance logging service with new lifecycle capabilities and interceptor support - Updated `LoggingInterface` to remove singleton-style initialization. - Introduced `LoggingInitializable` and `LoggingInitializationMixin` for optional lifecycle management. - Added `LogEvent` and `LogInterceptor` classes for improved logging event handling and interception. - Updated `ArcaneLogger` to support multiple logging interfaces and global interceptors. - Modified `DebugPrint` and `DebugAuthInterface` to align with new logging structure. - Enhanced tests to cover new logging features and interceptor functionality. Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Add stream-based updates for authentication, feature flags, logging, and theming - Added `statusChanges` and `signedInChanges` streams to `ArcaneAuth` for real-time authentication updates. - Introduced `enabledFeaturesChanges` stream in `ArcaneFeatureFlags` for observing feature updates. - Improved `ArcaneLogger` to maintain `logStream` usability after listener cancellation. - Updated `ArcaneTheme` to provide streams for theme mode and theme data changes. - Enhanced documentation and examples to reflect new stream APIs and usage patterns. - Added regression tests for stream listener cancellation and re-subscription across services. Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Refactor ArcaneEnvironment and AuthenticationService for improved environment management and status handling Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Add application environment management and tests for authentication status coherence Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * feat: Enhance service management with ArcaneApp provider composition This commit significantly refactors Arcane's service architecture. ArcaneApp now acts as a StatefulWidget, composing InheritedWidget- based providers for core services (features, environment, theme, auth). Service lookups (e.g., Arcane.features, context.service()) now prioritize provider-registered instances, falling back to singletons. Key changes include: - Renamed ArcaneFeatureFlags to ArcaneFeatureFlagService and ArcaneReactiveTheme to ArcaneThemeService (with typedefs). - Introduced ArcaneEnvironmentService and ArcaneEnvironmentProvider for centralized environment management. - Added BuildContext extensions (e.g., context.featureFlags) for reactive, convenient service access. - Removed .puro.json and its references, streamlining SDK setup. - Updated CHANGELOG.md to reflect a 2.0.0 release, detailing all breaking changes and new features. * chore(example): Add ignore rules for example builds * feat(logging): Introduce log interceptors and origin control Introduces the LogInterceptor class, enabling pre-processing, modification, or suppression of log events before they reach registered interfaces. The LogInterceptorContext provides contextual information such as the originating LoggingInterface. Adds a `skipAutodetection` parameter to Arcane.log, allowing control over the automatic detection of log origin (module, method, file/line). Also makes the LogEvent class extendable to support custom event types and updates existing interceptor callback signatures for consistency. * fix(theme): Update theme mode check to use currentModeOf method Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * fix(theme): Improve theme mode detection and toggling `context.isDarkMode` now reflects the app's effective theme brightness, not the raw platform brightness. This ensures `isDarkMode` accurately reports the currently rendered theme. `switchTheme()` now intelligently toggles from the *effective* theme when in `ThemeMode.system` by considering the current app brightness. `followSystemTheme()` is updated to always read the platform brightness directly, decoupling its behavior from the app's overridden theme settings. * feat(example): Improve theme and service integration demo Updates the example application to better demonstrate service and theme integration. The `FavoriteColorService` now actively sets the app's color scheme and can initialize its state from the current theme. Environment display is now reactive, and the UI responds dynamically to service registration and removal. Initial themes are now explicitly seeded. * feat(example): Add interactive persistent metadata toggle Previously, persistent metadata was added unconditionally. This change allows users to dynamically enable or disable the demo persistent metadata via a UI switch, better showcasing the API functionality. * feat(theme): Add assignment-style theme setters Introduces convenience setters for dark and light themes, allowing `Arcane.theme.dark = ...` and `Arcane.theme.light = ...` as an alternative to `setDarkTheme` and `setLightTheme`. This improves developer ergonomics and conciseness. * docs(README): Add Application Environments section to features list Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * Adds `ArcaneApp.builder` to provide a provider-aware `BuildContext` for the application root. This deprecates the `ArcaneApp.child` parameter, improving developer experience for accessing Arcane's providers at build time. Updates the `ArcaneThemeSwitcher` to default to `followSystemTheme` when mounted under `ArcaneApp`, ensuring system theme behavior is enabled out of the box. Fixes `setDarkTheme` and `setLightTheme` to only update the rendered theme if their respective modes are currently active. This prevents unintended UI changes when updating the definition of an inactive theme. Updates README and examples to reflect the new `builder` API and clarified theme logic. Adds new tests for these changes. * docs(arcane_app): Clarify ArcaneApp API and provider access documentation Updates the documentation for the `ArcaneApp` constructor to explicitly detail the preferred `builder` API and the deprecated `child` parameter, including migration guidance. Also updates the list of provided services to include `ArcaneFeatureFlagsProvider`. * feat: Overhaul Arcane framework for 2.0.0 release notes Migrate Arcane to a static utility surface, removing the instantiable singleton constructor for simpler and more direct access to services. Introduce new reactive streams for environment, authentication, and theme services, enabling real-time observation of state changes. Enhance `ArcaneApp` integration with the new `builder` callback and `BuildContext` convenience accessors for services and feature flags. Update `ArcaneAuthInterface.logout` signature and revise `src` import paths, requiring consumers to update their implementations and imports. Deprecate `ArcaneApp.child` and `BuildContext.serviceOfType<T>()` in favor of new, more idiomatic APIs. Remove direct `flutter_bloc` dependency and upgrade `result_monad` to `^4.0.0`. * refactor(environment): Rename environment access getter to current This change unifies how the current application environment is accessed across Arcane's services and providers. The `state` and `environment` getters have been replaced with a consistent `current` getter, simplifying API usage and aligning with new patterns. Includes corresponding updates in example and internal code, and documents the migration in the CHANGELOG. * chore: Relax result_monad dependency constraint The `result_monad` dependency was recently upgraded to `^4.0.0`. This update relaxes the constraint to `any` to provide greater flexibility and mitigate potential dependency conflicts for consumers of Arcane, allowing them to use other compatible versions. * refactor(logging): Replace LoggingInitializationMixin with LoggingInitialization and add LoggingFeature annotation support Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * docs(changelog): Add migration steps for ArcaneThemeService and update themeMode configuration examples Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * refactor(workflow): Simplify analyze-and-test workflow by removing unused environment variables and steps Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * docs(changelog): Update Arcane.log metadata type and add migration steps for structured values Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * test: Add unit tests for authentication and feature flags functionality Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * feat(theme): track user-defined theme overrides in ArcaneThemeService Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * refactor(service): update service access methods in ArcaneServiceProvider Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * refactor(tests): format login and logout method signatures in MockAuth for improved readability Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * feat(tests): add unit tests for ArcaneThemeService functionality Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> --------- Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * fix(dependencies): update result_monad and arcane_helper_utils constraints Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * feat(auth): add callbacks for login/logout events in DebugAuthInterface fix(logging): ensure proper cancellation of log stream subscriber refactor(arcane): make built-in services list unmodifiable fix(app): update service notifier on widget updates fix(service): improve removeService method to return boolean fix(auth): update BuildContext parameter to unused in setDebug/setNormal fix(logging): correct log level reference in LogInterceptorContext documentation fix(theme): update documentation to reflect ThemeMode instead of ThemeData fix(theme): ensure unawaited cancellation of theme subscriptions chore(dependencies): update arcane_analysis version to ^1.0.4 test: make ArcaneAuthenticationService reset asynchronous in tests Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * feat(logging): implement global and type-scoped interceptors in ArcaneLogger - Added support for global interceptors that apply to all interfaces. - Introduced type-scoped interceptors for specific interface types. - Updated CHANGELOG with migration steps and new API details. - Adjusted README and tests to reflect changes in interceptor registration. Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * refactor(theme): clean up theme service tests and improve readability Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * feat(logging): enhance logging service tests with type-scoped interceptors and global interceptor functionality Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * fix(gitignore): add .example/.vscode/ to ignore list Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * chore(readme): add Arcane logo to the README for better branding Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> * feat(logging): implement interceptor management with collection-style APIs and scoped matching Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com> --------- Signed-off-by: Hans Kokx <hans.d.kokx@gmail.com>
2026-08-12 06:10:55 +02:00 · 2026-05-26 16:13:06 +02:00
parent e4cd13bf65
commit 6f6428b23c
7 changed files with 450 additions and 84 deletions
@@ -60,6 +60,36 @@ class TestPassiveLoggingInterface extends LoggingInterface {
  }
 }

+class TestAlternativeLoggingInterface extends LoggingInterface {
+  TestAlternativeLoggingInterface(this.name);
+
+  final String name;
+  final List<LogEvent> events = [];
+
+  @override
+  void log(
+    String message, {
+    Map<String, Object?>? metadata,
+    Level? level,
+    StackTrace? stackTrace,
+    Object? extra,
+  }) {
+    events.add(
+      LogEvent(
+        message: message,
+        metadata: metadata == null ? null : Map<String, Object?>.from(metadata),
+        level: level,
+        stackTrace: stackTrace,
+        extra: extra,
+      ),
+    );
+  }
+}
+
+class TestDerivedLoggingInterface extends TestLoggingInterface {
+  TestDerivedLoggingInterface(super.name);
+}
+
 class RedactingLogInterceptor implements LogInterceptor {
  const RedactingLogInterceptor();

@@ -198,7 +228,18 @@ void main() {
        await Arcane.logger.registerInterface(myInterface);

        Arcane.log("before");
-        Arcane.logger.registerInterceptor(prefixInterceptor);
+        Arcane.logger.interceptors.add(prefixInterceptor);
+        Arcane.log("after");
+
+        expect(myInterface.events[0].message, "before");
+        expect(myInterface.events[1].message, "[global] after");
+      });
+
+      test("interceptor collection add defaults to global", () async {
+        await Arcane.logger.registerInterface(myInterface);
+
+        Arcane.log("before");
+        Arcane.logger.interceptors.add(prefixInterceptor);
        Arcane.log("after");

        expect(myInterface.events[0].message, "before");
@@ -219,16 +260,90 @@ void main() {
        await Arcane.logger.registerInterface(myInterface);

        Arcane.log("before");
-        Arcane.logger.registerInterceptor(dropForPrimary);
+        Arcane.logger.interceptors.add(
+          dropForPrimary,
+          matcher: (LoggingInterface interface) =>
+              interface is TestLoggingInterface,
+        );
        Arcane.log("blocked");
-        Arcane.logger.unregisterInterceptor(dropForPrimary);
-        Arcane.log("after");

        expect(
          myInterface.events.map((LogEvent event) => event.message),
-          ["before", "after"],
+          ["before"],
        );
      });
+
+      test("type-scoped interceptors only apply to matching interfaces",
+          () async {
+        final TestAlternativeLoggingInterface alternativeInterface =
+            TestAlternativeLoggingInterface("alternative");
+
+        await Arcane.logger.registerInterfaces([
+          myInterface,
+          alternativeInterface,
+        ]);
+
+        Arcane.logger.interceptors.add(
+          LogInterceptor((event, context) {
+            return event.copyWith(message: "[typed] ${event.message}");
+          }),
+          matcher: (LoggingInterface interface) =>
+              interface is TestLoggingInterface,
+        );
+
+        Arcane.log("typed");
+
+        expect(myInterface.events.last.message, "[typed] typed");
+        expect(alternativeInterface.events.last.message, "typed");
+      });
+
+      test("matcher-based type-scoped interceptors can include subtypes",
+          () async {
+        final TestDerivedLoggingInterface derivedInterface =
+            TestDerivedLoggingInterface("derived");
+        final TestAlternativeLoggingInterface alternativeInterface =
+            TestAlternativeLoggingInterface("alternative");
+
+        await Arcane.logger.registerInterfaces([
+          myInterface,
+          derivedInterface,
+          alternativeInterface,
+        ]);
+
+        Arcane.logger.interceptors.add(
+          LogInterceptor((event, context) {
+            return event.copyWith(message: "[family] ${event.message}");
+          }),
+          matcher: (LoggingInterface interface) =>
+              interface is TestLoggingInterface,
+        );
+
+        Arcane.log("typed");
+
+        expect(myInterface.events.last.message, "[family] typed");
+        expect(derivedInterface.events.last.message, "[family] typed");
+        expect(alternativeInterface.events.last.message, "typed");
+      });
+
+      test(
+          "registering a type-scoped interceptor before matching interface exists stores it for future registrations",
+          () async {
+        final TestLoggingInterface secondary =
+            TestLoggingInterface("secondary");
+
+        Arcane.logger.interceptors.add(
+          LogInterceptor((event, context) {
+            return event.copyWith(message: "[future] ${event.message}");
+          }),
+          matcher: (LoggingInterface interface) =>
+              interface is TestLoggingInterface,
+        );
+
+        await Arcane.logger.registerInterface(secondary);
+        Arcane.log("hello");
+
+        expect(secondary.events.single.message, "[future] hello");
+      });
    });

    group("persistent metadata", () {
@@ -313,7 +428,7 @@ void main() {
      });

      test("global interceptors run in registration order", () async {
-        Arcane.logger.registerInterceptors([
+        Arcane.logger.interceptors.addAll([
          LogInterceptor((event, context) {
            expect(context.interface, same(myInterface));
            return event.copyWith(message: "${event.message}:first");
@@ -331,7 +446,7 @@ void main() {

      test("global interceptors can drop events for all interfaces", () async {
        await Arcane.logger.registerInterface(myInterface);
-        Arcane.logger.registerInterceptor(
+        Arcane.logger.interceptors.add(
          LogInterceptor((event, context) => null),
        );

@@ -340,8 +455,17 @@ void main() {
        expect(myInterface.events, isEmpty);
      });

+      test("interceptor collection remove defaults to global", () async {
+        Arcane.logger.interceptors.add(prefixInterceptor);
+        Arcane.logger.interceptors.remove(prefixInterceptor);
+
+        Arcane.log(logMessage);
+
+        expect(myInterface.events.single.message, logMessage);
+      });
+
      test("custom interceptor classes can implement LogInterceptor", () async {
-        Arcane.logger.registerInterceptor(const RedactingLogInterceptor());
+        Arcane.logger.interceptors.add(const RedactingLogInterceptor());

        Arcane.log(
          logMessage,
@@ -365,7 +489,11 @@ void main() {
          },
        );

-        Arcane.logger.registerInterceptor(allowPrimaryOnly);
+        Arcane.logger.interceptors.add(
+          allowPrimaryOnly,
+          matcher: (LoggingInterface interface) =>
+              interface is TestLoggingInterface,
+        );
        await Arcane.logger.registerInterface(
          secondaryInterface,
        );
@@ -376,11 +504,39 @@ void main() {
        expect(secondaryInterface.events, isEmpty);
      });

+      test("interceptor collection remove with matcher removes scoped entries",
+          () async {
+        final TestLoggingInterface secondaryInterface =
+            TestLoggingInterface("secondary");
+        final LogInterceptor scopedInterceptor =
+            LogInterceptor((event, context) {
+          return event.copyWith(message: "[scoped] ${event.message}");
+        });
+        bool scopedMatcher(LoggingInterface interface) =>
+            interface is TestLoggingInterface;
+
+        Arcane.logger.interceptors.add(
+          scopedInterceptor,
+          matcher: scopedMatcher,
+        );
+
+        await Arcane.logger.registerInterface(secondaryInterface);
+        Arcane.logger.interceptors.remove(
+          scopedInterceptor,
+          matcher: scopedMatcher,
+        );
+
+        Arcane.log(logMessage);
+
+        expect(myInterface.events.single.message, logMessage);
+        expect(secondaryInterface.events.single.message, logMessage);
+      });
+
      test("interface interceptors receive the current interface", () async {
        final TestLoggingInterface secondaryInterface =
            TestLoggingInterface("secondary");

-        Arcane.logger.registerInterceptor(
+        Arcane.logger.interceptors.add(
          LogInterceptor((event, context) {
            final TestLoggingInterface currentInterface =
                context.interface! as TestLoggingInterface;
@@ -391,6 +547,8 @@ void main() {
              },
            );
          }),
+          matcher: (LoggingInterface interface) =>
+              interface is TestLoggingInterface,
        );
        await Arcane.logger.registerInterface(
          secondaryInterface,
@@ -410,12 +568,14 @@ void main() {
        final TestLoggingInterface secondaryInterface =
            TestLoggingInterface("secondary");

-        Arcane.logger.registerInterceptor(
+        Arcane.logger.interceptors.add(
          LogInterceptor((event, context) {
            event.metadata?["mutatedBy"] =
                (context.interface as TestLoggingInterface).name;
            return event;
          }),
+          matcher: (LoggingInterface interface) =>
+              interface is TestLoggingInterface,
        );
        await Arcane.logger.registerInterface(
          secondaryInterface,
@@ -457,7 +617,7 @@ void main() {
      });

      test("reset clears global interceptors", () async {
-        Arcane.logger.registerInterceptor(prefixInterceptor);
+        Arcane.logger.interceptors.add(prefixInterceptor);
        Arcane.logger.reset();
        await Arcane.logger.registerInterface(myInterface);

@@ -465,6 +625,56 @@ void main() {

        expect(myInterface.events.single.message, logMessage);
      });
+
+      test("global and type-scoped duplicate registrations are additive",
+          () async {
+        final LogInterceptor duplicateInterceptor = LogInterceptor(
+          (event, context) {
+            final int count = (event.metadata?["count"] as int?) ?? 0;
+            return event.copyWith(
+              metadata: {
+                ...?event.metadata,
+                "count": count + 1,
+              },
+            );
+          },
+        );
+
+        Arcane.logger
+          ..interceptors.add(duplicateInterceptor)
+          ..interceptors.add(
+            duplicateInterceptor,
+            matcher: (LoggingInterface interface) =>
+                interface is TestLoggingInterface,
+          );
+
+        Arcane.log(
+          logMessage,
+          metadata: {
+            "count": 0,
+          },
+        );
+
+        expect(myInterface.events.single.metadata?["count"], 2);
+      });
+
+      test(
+          "interceptor collection clear removes global and scoped interceptors",
+          () async {
+        Arcane.logger.interceptors.add(prefixInterceptor);
+        Arcane.logger.interceptors.add(
+          LogInterceptor((event, context) {
+            return event.copyWith(message: "[scoped] ${event.message}");
+          }),
+          matcher: (LoggingInterface interface) =>
+              interface is TestLoggingInterface,
+        );
+
+        Arcane.logger.interceptors.clear();
+        Arcane.log(logMessage);
+
+        expect(myInterface.events.single.message, logMessage);
+      });
    });
  });
 }
@@ -36,9 +36,11 @@ void main() {

    test("reset restores defaults", () {
      ArcaneThemeService.I.setDarkTheme(
-          ThemeData(primaryColor: Colors.red, brightness: Brightness.dark),);
+        ThemeData(primaryColor: Colors.red, brightness: Brightness.dark),
+      );
      ArcaneThemeService.I.setLightTheme(
-          ThemeData(primaryColor: Colors.blue, brightness: Brightness.light),);
+        ThemeData(primaryColor: Colors.blue, brightness: Brightness.light),
+      );
      ArcaneThemeService.I.reset();
      expect(ArcaneThemeService.I.dark, ThemeData.dark());
      expect(ArcaneThemeService.I.light, ThemeData.light());