Remove AbortScope utility class (#139)

Author: AlexeyMz

CHANGELOG.md

@@ -30,6 +30,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Preparations to extract generic scrollable paper component `Paper` from diagram-specific state and logic:
   * Replace `reactodia-paper-area` CSS class by `reactodia-canvas-area` and `reactodia-paper`.
   * Deprecate `CanvasMetrics.area` in favor of `CanvasMetrics.pane`.
+- Remove `AbortScope` utility class (can be trivially replaced by the built-in [`AbortSignal.any()`](https://developer.mozilla.org/en-US/docs/Web/API/AbortSignal/any_static) function).
 
 ## [0.33.0] - 2026-03-16
 #### 🚀 New Features

src/coreUtils/async.ts

@@ -19,43 +19,6 @@ export function mapAbortedToNull<T>(
     return promise.then(onResolve, onReject);
 }
 
-/**
- * Creates a derived abort signal, i.e. `AbortSignal` instance
- * which is automatically aborted when parent signal is aborted,
- * but can be aborted separately the same way as normal `AbortController`.
- *
- * @category Utilities
- */
-export class AbortScope {
-    private readonly controller: AbortController;
-    private readonly parentSignal: AbortSignal | undefined;
-    private onAbort: (() => void) | undefined;
-
-    constructor(parentSignal: AbortSignal | undefined) {
-        this.controller = new AbortController();
-        if (parentSignal) {
-            this.parentSignal = undefined;
-            this.onAbort = () => this.controller.abort();
-            parentSignal.addEventListener('abort', this.onAbort);
-        }
-    }
-
-    get signal(): AbortSignal {
-        return this.controller.signal;
-    }
-
-    [Symbol.dispose]() {
-        this.controller.abort();
-        if (this.parentSignal && this.onAbort) {
-            this.parentSignal.removeEventListener('abort', this.onAbort);
-        }
-    }
-
-    abort() {
-        this[Symbol.dispose]();
-    }
-}
-
 /**
  * Waits a specified timeout in milliseconds the resolves the result promise.
  *

src/editor/dataDiagramModel.ts

@@ -1,6 +1,5 @@
 import type { ReadonlyHashMap } from '@reactodia/hashmap';
 
-import { AbortScope } from '../coreUtils/async';
 import { AnyEvent, EventSource, Events } from '../coreUtils/events';
 import { Translation, TranslatedText } from '../coreUtils/i18n';
 
@@ -157,7 +156,7 @@ export class DataDiagramModel extends DiagramModel implements DataGraphStructure
     private readonly translation: Translation;
 
     private dataGraph = new DataGraph();
-    private loadingScope: AbortScope | undefined;
+    private loadingScope: AbortController | undefined;
     private _dataProvider: DataProvider;
     private _locale: DataLocaleProvider;
     private fetcher: DataFetcher;
@@ -390,11 +389,15 @@ export class DataDiagramModel extends DiagramModel implements DataGraphStructure
             translation: this.translation,
         });
 
-        this.loadingScope = new AbortScope(parentSignal);
+        const scope = new AbortController();
+        this.loadingScope = scope;
+        const onParentSignalAbort = () => scope.abort();
+
         this.extendedSource.trigger('loadingStart', {source: this});
         const signal = this.loadingScope.signal;
-
+        
         try {
+            parentSignal?.addEventListener('abort', onParentSignalAbort);
             signal.throwIfAborted();
 
             this.setLinkSettings(diagram.linkTypeOptions ?? []);
@@ -438,6 +441,7 @@ export class DataDiagramModel extends DiagramModel implements DataGraphStructure
             this.extendedSource.trigger('loadingError', {source: this, error});
             throw new Error('Reactodia: failed to import a layout', {cause: error});
         } finally {
+            parentSignal?.removeEventListener('abort', onParentSignalAbort);
             this.loadingScope?.abort();
             this.loadingScope = undefined;
         }

src/workspace.ts

@@ -1,6 +1,6 @@
 import '../styles/main.scss';
 
-export { AbortScope, mapAbortedToNull, delay } from './coreUtils/async';
+export { mapAbortedToNull, delay } from './coreUtils/async';
 export { moveComparator, shallowArrayEqual } from './coreUtils/collections';
 export { useColorScheme } from './coreUtils/colorScheme';
 export {