@tstdl/base 0.86.1 → 0.87.1

package/disposable/async-disposer.js

@@ -22,8 +22,8 @@ __export(async_disposer_exports, {
 });
 module.exports = __toCommonJS(async_disposer_exports);
 var import_type_guards = require("../utils/type-guards.js");
+var import_token = require("../cancellation/token.js");
 var import_multi_error = require("../error/multi.error.js");
-var import_cancellation_token = require("../utils/cancellation-token.js");
 var import_disposable = require("./disposable.js");
 const deferrerToken = Symbol("DeferrerToken");
 class AsyncDisposer {
@@ -31,10 +31,10 @@ class AsyncDisposer {
   #disposedToken;
   #deferrers;
   #tasks;
-  get disposingToken() {
+  get disposingSignal() {
     return this.#disposingToken;
   }
-  get disposedToken() {
+  get disposedSignal() {
     return this.#disposedToken;
   }
   get disposing() {
@@ -47,8 +47,8 @@ class AsyncDisposer {
   constructor() {
     this.#deferrers = /* @__PURE__ */ new Set();
     this.#tasks = [];
-    this.#disposingToken = new import_cancellation_token.CancellationToken();
-    this.#disposedToken = new import_cancellation_token.CancellationToken();
+    this.#disposingToken = new import_token.CancellationToken();
+    this.#disposedToken = new import_token.CancellationToken();
   }
   use(value) {
     if ((0, import_type_guards.isNullOrUndefined)(value)) {
@@ -73,7 +73,7 @@ class AsyncDisposer {
   }
   getDeferrer() {
     const deferrer = {
-      [deferrerToken]: new import_cancellation_token.CancellationToken(),
+      [deferrerToken]: new import_token.CancellationToken(),
       yield: () => {
         deferrer[deferrerToken].set();
         this.#deferrers.delete(deferrer);

package/distributed-loop/distributed-loop.d.ts

@@ -1,7 +1,7 @@
+import type { CancellationSignal } from '../cancellation/index.js';
 import { resolveArgumentType } from '../injector/index.js';
 import type { Resolvable } from '../injector/interfaces.js';
 import { LockProvider } from '../lock/index.js';
-import type { ReadonlyCancellationToken } from '../utils/cancellation-token.js';
 import type { LoopController } from './controller.js';
 export type LoopFunction = (controller: LoopController) => any | Promise<any>;
 /** loop key */
@@ -22,11 +22,11 @@ export declare class DistributedLoop implements Resolvable<DistributedLoopArgume
     constructor(key: string, lockProvider: LockProvider);
     /**
      * run the function {@link func} every {@link interval} milliseconds with an accuracy of {@link accuracy}
-     * until {@link cancellationToken} is set or stop on the {@link LoopController} is called
+     * until {@link cancellationSignal} is set or stop on the {@link LoopController} is called
      * @param interval in millseconds
      * @param accuracy in millseconds
      * @param func handler to run
-     * @param cancellationToken token to cancel loop (same as calling stop on the {@link LoopController})
+     * @param cancellationSignal token to cancel loop (same as calling stop on the {@link LoopController})
      */
-    run(interval: number, accuracy: number, func: LoopFunction, cancellationToken?: ReadonlyCancellationToken): LoopController;
+    run(interval: number, accuracy: number, func: LoopFunction, cancellationSignal?: CancellationSignal): LoopController;
 }

package/distributed-loop/distributed-loop.js

@@ -21,10 +21,10 @@ __export(distributed_loop_exports, {
   DistributedLoop: () => DistributedLoop
 });
 module.exports = __toCommonJS(distributed_loop_exports);
+var import_cancellation = require("../cancellation/index.js");
 var import_injector = require("../injector/index.js");
 var import_lock = require("../lock/index.js");
 var import_deferred_promise = require("../promise/deferred-promise.js");
-var import_cancellation_token = require("../utils/cancellation-token.js");
 var import_timer = require("../utils/timer.js");
 var import_timing = require("../utils/timing.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -64,15 +64,15 @@ let DistributedLoop = class DistributedLoop2 {
   }
   /**
    * run the function {@link func} every {@link interval} milliseconds with an accuracy of {@link accuracy}
-   * until {@link cancellationToken} is set or stop on the {@link LoopController} is called
+   * until {@link cancellationSignal} is set or stop on the {@link LoopController} is called
    * @param interval in millseconds
    * @param accuracy in millseconds
    * @param func handler to run
-   * @param cancellationToken token to cancel loop (same as calling stop on the {@link LoopController})
+   * @param cancellationSignal token to cancel loop (same as calling stop on the {@link LoopController})
    */
-  run(interval, accuracy, func, cancellationToken) {
+  run(interval, accuracy, func, cancellationSignal) {
     const $stopped = new import_deferred_promise.DeferredPromise();
-    const stopToken = cancellationToken?.createChild() ?? new import_cancellation_token.CancellationToken();
+    const stopToken = cancellationSignal?.createChild() ?? new import_cancellation.CancellationToken();
     const stopFunction = async () => {
       if (!stopToken.isSet) {
         stopToken.set();
@@ -83,7 +83,7 @@ let DistributedLoop = class DistributedLoop2 {
       stop: stopFunction,
       $stopped
     };
-    (async () => {
+    void (async () => {
       const lock = this.lockProvider.get(this.key);
       const timer = new import_timer.Timer();
       try {

package/enumerable/async-enumerable.d.ts

@@ -1,5 +1,5 @@
+import type { CancellationSignal } from '../cancellation/token.js';
 import type { AnyIterable } from '../utils/any-iterable-iterator.js';
-import type { ReadonlyCancellationToken } from '../utils/cancellation-token.js';
 import type { AsyncComparator } from '../utils/sort.js';
 import type { Observable } from 'rxjs';
 import type { AsyncIteratorFunction, AsyncPredicate, AsyncReducer, AsyncRetryPredicate, ParallelizableIteratorFunction, ParallelizablePredicate, ThrottleFunction } from '../utils/async-iterable-helpers/index.js';
@@ -56,7 +56,7 @@ export declare class AsyncEnumerable<T> implements EnumerableMethods, AsyncItera
     sort(comparator?: AsyncComparator<T>): AsyncEnumerable<T>;
     sortToArray(comparator?: AsyncComparator<T>): Promise<T[]>;
     take(count: number): AsyncEnumerable<T>;
-    takeUntil(cancellationToken: ReadonlyCancellationToken): AsyncEnumerable<T>;
+    takeUntil(cancellationSignal: CancellationSignal): AsyncEnumerable<T>;
     takeWhile(yieldLastOnFalse: boolean, predicate: AsyncPredicate<T>): AsyncEnumerable<T>;
     throttle(delayOrThrottleFunction: number | ThrottleFunction): AsyncEnumerable<T>;
     toArray(): Promise<T[]>;

package/enumerable/async-enumerable.js

@@ -198,8 +198,8 @@ class AsyncEnumerable {
     const taken = (0, import_async_iterable_helpers.takeAsync)(this.source, count);
     return new AsyncEnumerable(taken);
   }
-  takeUntil(cancellationToken) {
-    const taken = (0, import_async_iterable_helpers.takeUntilAsync)(this.source, cancellationToken);
+  takeUntil(cancellationSignal) {
+    const taken = (0, import_async_iterable_helpers.takeUntilAsync)(this.source, cancellationSignal);
     return new AsyncEnumerable(taken);
   }
   takeWhile(yieldLastOnFalse, predicate) {

package/enumerable/enumerable.d.ts

@@ -1,5 +1,5 @@
+import type { CancellationSignal } from '../cancellation/token.js';
 import type { Comparator } from '../utils/sort.js';
-import type { ReadonlyCancellationToken } from '../utils/cancellation-token.js';
 import type { IterableItemMetadata, IteratorFunction, Predicate, Reducer, TypePredicate } from '../utils/iterable-helpers/index.js';
 import { AsyncEnumerable } from './async-enumerable.js';
 import type { EnumerableMethods } from './enumerable-methods.js';
@@ -47,7 +47,7 @@ export declare class Enumerable<T> implements EnumerableMethods, Iterable<T> {
     sort(comparator?: Comparator<T>): Enumerable<T>;
     sortToArray(comparator?: Comparator<T>): T[];
     take(count: number): Enumerable<T>;
-    takeUntil(cancellationToken: ReadonlyCancellationToken): Enumerable<T>;
+    takeUntil(cancellationSignal: CancellationSignal): Enumerable<T>;
     takeWhile(yieldLastOnFalse: boolean, predicate: Predicate<T>): Enumerable<T>;
     toArray(): T[];
     toAsync(): AsyncEnumerable<T>;

package/enumerable/enumerable.js

@@ -169,8 +169,8 @@ class Enumerable {
     const taken = (0, import_iterable_helpers.take)(this.source, count);
     return new Enumerable(taken);
   }
-  takeUntil(cancellationToken) {
-    const taken = (0, import_iterable_helpers.takeUntil)(this.source, cancellationToken);
+  takeUntil(cancellationSignal) {
+    const taken = (0, import_iterable_helpers.takeUntil)(this.source, cancellationSignal);
     return new Enumerable(taken);
   }
   takeWhile(yieldLastOnFalse, predicate) {

package/examples/api/streaming.js

@@ -27,7 +27,7 @@ var __decorate = function(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 (0, import_core.configureTstdl)();
-const logger = import_core.rootInjector.resolve(import_core.CORE_LOGGER);
+const logger = (0, import_core.getGlobalInjector)().resolve(import_core.CORE_LOGGER);
 const streamingApiDefinition = (0, import_api.defineApi)({
   resource: "streams",
   endpoints: {
@@ -69,10 +69,10 @@ StreamingApi = __decorate([
 ], StreamingApi);
 async function* counter() {
   let currentNumber = 0;
-  while (import_application.Application.shutdownToken.isUnset && currentNumber < 10) {
+  while (import_application.Application.shutdownSignal.isUnset && currentNumber < 10) {
     yield `${++currentNumber}`.toString();
     logger.info(`yield: "${currentNumber}"`);
-    await (0, import_timing.cancelableTimeout)(1e3, import_application.Application.shutdownToken);
+    await (0, import_timing.cancelableTimeout)(1e3, import_application.Application.shutdownSignal);
   }
 }
 const StreamingApiClient = (0, import_client.compileClient)(streamingApiDefinition);

package/http/client/adapters/undici-http-client.adapter.js

@@ -83,7 +83,7 @@ let UndiciHttpClientAdapter = class UndiciHttpClientAdapter2 extends import_http
     try {
       const response = await (0, import_undici.request)(httpClientRequest.url, {
         method: httpClientRequest.method,
-        signal: httpClientRequest.abortToken.asAbortSignal(),
+        signal: httpClientRequest.abortSignal.asAbortSignal(),
         headers: httpClientRequest.headers.asNormalizedObject(),
         body,
         headersTimeout: httpClientRequest.timeout,

package/http/client/http-client-request.d.ts

@@ -1,7 +1,7 @@
+import type { CancellationSignal } from '../../cancellation/index.js';
 import type { Disposable } from '../../disposable/index.js';
 import { dispose } from '../../disposable/index.js';
 import type { Record, TypedOmit, UndefinableJson, UndefinableJsonObject } from '../../types.js';
-import type { ReadonlyCancellationToken } from '../../utils/cancellation-token.js';
 import type { HttpFormObject } from '../http-form.js';
 import { HttpForm } from '../http-form.js';
 import type { HttpHeadersObject } from '../http-headers.js';
@@ -28,7 +28,7 @@ export type HttpRequestAuthorization = {
     bearer?: string;
     token?: string;
 };
-export type HttpClientRequestOptions = Partial<TypedOmit<HttpClientRequest, 'url' | 'method' | 'abortToken' | 'abort' | 'headers' | 'query' | 'body'>> & {
+export type HttpClientRequestOptions = Partial<TypedOmit<HttpClientRequest, 'url' | 'method' | 'abortSignal' | 'abort' | 'headers' | 'query' | 'body'>> & {
     urlParameter?: HttpUrlParametersObject | HttpUrlParameters;
     headers?: HttpHeadersObject | HttpHeaders;
     query?: HttpQueryObject | HttpQuery;
@@ -41,7 +41,7 @@ export type HttpClientRequestOptions = Partial<TypedOmit<HttpClientRequest, 'url
         buffer?: Uint8Array;
         stream?: ReadableStream<Uint8Array>;
     };
-    abortToken?: ReadonlyCancellationToken;
+    abortSignal?: CancellationSignal;
 };
 export type HttpRequestCredentials = 'omit' | 'same-origin' | 'include';
 export type HttpClientRequestObject = HttpClientRequestOptions & {
@@ -49,7 +49,7 @@ export type HttpClientRequestObject = HttpClientRequestOptions & {
     method?: HttpMethod;
 };
 export declare class HttpClientRequest implements Disposable {
-    private readonly _abortToken;
+    #private;
     url: string;
     method: HttpMethod;
     headers: HttpHeaders;
@@ -118,7 +118,7 @@ export declare class HttpClientRequest implements Disposable {
     /**
      * can be used to cancel the request. Throws HttpError
      */
-    get abortToken(): ReadonlyCancellationToken;
+    get abortSignal(): CancellationSignal;
     constructor(url: string, method?: HttpMethod, options?: HttpClientRequestOptions);
     constructor(requestObject: HttpClientRequestObject);
     [dispose](): void;

package/http/client/http-client-request.js

@@ -21,8 +21,8 @@ __export(http_client_request_exports, {
   HttpClientRequest: () => HttpClientRequest
 });
 module.exports = __toCommonJS(http_client_request_exports);
+var import_cancellation = require("../../cancellation/index.js");
 var import_disposable = require("../../disposable/index.js");
-var import_cancellation_token = require("../../utils/cancellation-token.js");
 var import_clone = require("../../utils/clone.js");
 var import_type_guards = require("../../utils/type-guards.js");
 var import_http_form = require("../http-form.js");
@@ -30,7 +30,7 @@ var import_http_headers = require("../http-headers.js");
 var import_http_query = require("../http-query.js");
 var import_http_url_parameters = require("../http-url-parameters.js");
 class HttpClientRequest {
-  _abortToken;
+  #abortToken;
   url;
   method;
   headers;
@@ -99,8 +99,8 @@ class HttpClientRequest {
   /**
    * can be used to cancel the request. Throws HttpError
    */
-  get abortToken() {
-    return this._abortToken.asReadonly();
+  get abortSignal() {
+    return this.#abortToken.signal;
   }
   constructor(urlOrObject, method, options = {}) {
     if ((0, import_type_guards.isString)(urlOrObject)) {
@@ -126,16 +126,16 @@ class HttpClientRequest {
     this.timeout = requestOptions.timeout ?? 3e4;
     this.throwOnNon200 = requestOptions.throwOnNon200 ?? true;
     this.context = requestOptions.context ?? {};
-    this._abortToken = requestOptions.abortToken?.createChild() ?? new import_cancellation_token.CancellationToken();
+    this.#abortToken = requestOptions.abortSignal?.createChild() ?? new import_cancellation.CancellationToken();
   }
   [import_disposable.dispose]() {
-    this._abortToken.set();
-    this._abortToken.complete();
+    this.#abortToken.set();
+    this.#abortToken.complete();
   }
   /** abort the request */
   abort() {
-    this._abortToken.set();
-    this._abortToken.complete();
+    this.#abortToken.set();
+    this.#abortToken.complete();
   }
   clone() {
     const request = new HttpClientRequest(this);

package/http/server/node/node-http-server.js

@@ -32,12 +32,12 @@ __export(node_http_server_exports, {
 });
 module.exports = __toCommonJS(node_http_server_exports);
 var Http = __toESM(require("node:http"), 1);
+var import_cancellation = require("../../../cancellation/index.js");
 var import_disposable = require("../../../disposable/index.js");
 var import_http_headers = require("../../../http/http-headers.js");
 var import_http_query = require("../../../http/http-query.js");
 var import_injector = require("../../../injector/index.js");
 var import_logger = require("../../../logger/index.js");
-var import_cancellation_token = require("../../../utils/cancellation-token.js");
 var import_encoding = require("../../../utils/encoding.js");
 var import_feedable_async_iterable = require("../../../utils/feedable-async-iterable.js");
 var import_readable_stream_adapter = require("../../../utils/stream/readable-stream-adapter.js");
@@ -129,7 +129,7 @@ let NodeHttpServer = class NodeHttpServer2 extends import_http_server.HttpServer
       }
       if (connections > 0) {
         this.logger.info(`Waiting for ${connections} connections to end`);
-        await (0, import_timing.cancelableTimeout)(250, import_cancellation_token.CancellationToken.from(close$));
+        await (0, import_timing.cancelableTimeout)(250, import_cancellation.CancellationToken.from(close$));
       }
     }
     this.untrackConnectedSockets?.();

package/injector/injector.js

@@ -27,7 +27,7 @@ var import_disposable = require("../disposable/disposable.js");
 var import_deferred_promise = require("../promise/deferred-promise.js");
 var import_registry = require("../reflection/registry.js");
 var import_array = require("../utils/array/array.js");
-var import_cancellation_token = require("../utils/cancellation-token.js");
+var import_cancellation = require("../cancellation/index.js");
 var import_factory_map = require("../utils/factory-map.js");
 var import_forward_ref = require("../utils/object/forward-ref.js");
 var import_object = require("../utils/object/object.js");
@@ -43,7 +43,7 @@ class Injector {
   static #globalRegistrations = /* @__PURE__ */ new Map();
   #parent;
   #children = [];
-  #disposeToken = new import_cancellation_token.CancellationToken();
+  #disposeToken = new import_cancellation.CancellationToken();
   #disposableStack = new AsyncDisposableStack();
   #registrations = /* @__PURE__ */ new Map();
   #injectorScopedResolutions = new import_multi_key_map.MultiKeyMap();
@@ -56,7 +56,7 @@ class Injector {
     this.name = name;
     this.#parent = parent;
     this.register(Injector, { useValue: this });
-    this.register(import_cancellation_token.CancellationToken, { useValue: this.#disposeToken });
+    this.register(import_cancellation.CancellationSignal, { useValue: this.#disposeToken.signal });
     this.#addDisposeHandler = (handler) => {
       if ((0, import_disposable.isSyncOrAsyncDisposable)(handler)) {
         this.#disposableStack.use(handler);
@@ -389,7 +389,7 @@ class Injector {
     const context = {
       resolve: (token, argument, options) => this._resolve(token, argument, options ?? {}, resolveContext, chain.addToken(token)),
       resolveAll: (token, argument, options) => this._resolveAll(token, argument, options ?? {}, resolveContext, chain.addToken(token)),
-      cancellationToken: this.#disposeToken,
+      cancellationSignal: this.#disposeToken,
       addDisposeHandler: this.#addDisposeHandler,
       get data() {
         return resolveContext.resolutionContextData.get(resolutionTag);
@@ -399,7 +399,7 @@ class Injector {
   }
   getAfterResolveContext(resolutionTag, resolveContext) {
     const context = {
-      cancellationToken: this.#disposeToken,
+      cancellationSignal: this.#disposeToken,
       addDisposeHandler: this.#addDisposeHandler,
       get data() {
         return resolveContext.resolutionContextData.get(resolutionTag);

package/injector/types.d.ts

@@ -1,6 +1,6 @@
+import type { CancellationSignal } from '../cancellation/index.js';
 import type { AsyncDisposeHandler } from '../disposable/async-disposer.js';
 import type { Record } from '../types.js';
-import type { ReadonlyCancellationToken } from '../utils/cancellation-token.js';
 import type { Injector } from './injector.js';
 import type { ResolveArgument } from './interfaces.js';
 import type { InjectionToken } from './token.js';
@@ -13,12 +13,12 @@ import type { InjectionToken } from './token.js';
 export type Lifecycle = 'transient' | 'resolution' | 'injector' | 'singleton';
 export type ResolveContext<D extends Record> = Pick<Injector, 'resolve' | 'resolveAll'> & {
     readonly data: ResolveContextData<D>;
-    readonly cancellationToken: ReadonlyCancellationToken;
+    readonly cancellationSignal: CancellationSignal;
     addDisposeHandler(handler: AsyncDisposeHandler): void;
 };
 export type AfterResolveContext<D extends Record> = {
     readonly data: ResolveContextData<D>;
-    readonly cancellationToken: ReadonlyCancellationToken;
+    readonly cancellationSignal: CancellationSignal;
     addDisposeHandler(handler: AsyncDisposeHandler): void;
 };
 export type Mapper<T = any, U = unknown> = (value: T) => U;

package/lock/mongo/lock.js

@@ -21,11 +21,11 @@ __export(lock_exports, {
   MongoLock: () => MongoLock
 });
 module.exports = __toCommonJS(lock_exports);
+var import_cancellation = require("../../cancellation/index.js");
 var import_decorators = require("../../injector/decorators.js");
 var import_lock = require("../../lock/index.js");
 var import_logger = require("../../logger/index.js");
 var import_alphabet = require("../../utils/alphabet.js");
-var import_cancellation_token = require("../../utils/cancellation-token.js");
 var import_date_time = require("../../utils/date-time.js");
 var import_random = require("../../utils/random.js");
 var import_timer = require("../../utils/timer.js");
@@ -78,7 +78,7 @@ let MongoLock = class MongoLock2 extends import_lock.Lock {
       return false;
     }
     let expiration = result;
-    const releaseToken = new import_cancellation_token.CancellationToken();
+    const releaseToken = new import_cancellation.CancellationToken();
     const controller = {
       get lost() {
         return (0, import_date_time.currentTimestamp)() >= expiration.valueOf();

package/lock/web/web-lock.js

@@ -21,9 +21,9 @@ __export(web_lock_exports, {
   WebLock: () => WebLock
 });
 module.exports = __toCommonJS(web_lock_exports);
+var import_cancellation = require("../../cancellation/index.js");
 var import_injector = require("../../injector/index.js");
 var import_deferred_promise = require("../../promise/deferred-promise.js");
-var import_cancellation_token = require("../../utils/cancellation-token.js");
 var import_type_guards = require("../../utils/type-guards.js");
 var import_rxjs = require("rxjs");
 var import_lock = require("../lock.js");
@@ -55,7 +55,7 @@ let WebLock = class WebLock2 extends import_lock.Lock {
         releasePromise.resolve();
       }
     };
-    const timeoutToken = (0, import_type_guards.isDefined)(timeout) && timeout > 0 ? import_cancellation_token.CancellationToken.from((0, import_rxjs.timer)(timeout).pipe((0, import_rxjs.map)(() => true))) : void 0;
+    const timeoutToken = (0, import_type_guards.isDefined)(timeout) && timeout > 0 ? import_cancellation.CancellationToken.from((0, import_rxjs.timer)(timeout).pipe((0, import_rxjs.map)(() => true))) : void 0;
     void navigator.locks.request(this.resource, {
       signal: (0, import_type_guards.isDefined)(timeoutToken) ? timeoutToken.asAbortSignal() : void 0,
       ifAvailable: (0, import_type_guards.isDefined)(timeout) && timeout <= 0

package/message-bus/message-bus-base.d.ts

@@ -1,7 +1,7 @@
-import type { Logger } from '../logger/index.js';
 import type { Observable } from 'rxjs';
+import type { Logger } from '../logger/index.js';
+import { CancellationToken } from '../cancellation/token.js';
 import { disposeAsync } from '../disposable/disposable.js';
-import { CancellationToken } from '../utils/cancellation-token.js';
 import { MessageBus } from './message-bus.js';
 export declare abstract class MessageBusBase<T> extends MessageBus<T> {
     private readonly logger;

package/message-bus/message-bus-base.js

@@ -22,8 +22,8 @@ __export(message_bus_base_exports, {
 });
 module.exports = __toCommonJS(message_bus_base_exports);
 var import_rxjs = require("rxjs");
+var import_token = require("../cancellation/token.js");
 var import_disposable = require("../disposable/disposable.js");
-var import_cancellation_token = require("../utils/cancellation-token.js");
 var import_message_bus = require("./message-bus.js");
 class MessageBusBase extends import_message_bus.MessageBus {
   logger;
@@ -35,7 +35,7 @@ class MessageBusBase extends import_message_bus.MessageBus {
     super();
     this.logger = logger;
     this.publishSubject = new import_rxjs.Subject();
-    this.disposeToken = new import_cancellation_token.CancellationToken();
+    this.disposeToken = new import_token.CancellationToken();
     this.messages$ = (0, import_rxjs.defer)(() => this._messages$).pipe((0, import_rxjs.takeUntil)(this.disposeToken.set$), (0, import_rxjs.share)());
     this.allMessages$ = (0, import_rxjs.merge)(this.messages$, this.publishSubject);
   }

package/migration/migrator.js

@@ -21,11 +21,11 @@ __export(migrator_exports, {
   Migrator: () => Migrator
 });
 module.exports = __toCommonJS(migrator_exports);
+var import_cancellation = require("../cancellation/index.js");
 var import_injector = require("../injector/index.js");
 var import_lock = require("../lock/index.js");
 var import_logger = require("../logger/index.js");
 var import_array = require("../utils/array/array.js");
-var import_cancellation_token = require("../utils/cancellation-token.js");
 var import_comparison = require("../utils/comparison.js");
 var import_math = require("../utils/math.js");
 var import_timer = require("../utils/timer.js");
@@ -68,7 +68,7 @@ let Migrator = class Migrator2 {
     const { result } = await lock.use(3e4, true, async () => {
       const results = [];
       while (true) {
-        const restartToken = new import_cancellation_token.CancellationToken();
+        const restartToken = new import_cancellation.CancellationToken();
         const control = {
           restart: () => restartToken.set()
         };

package/module/module-base.d.ts

@@ -1,6 +1,6 @@
+import type { CancellationSignal } from '../cancellation/index.js';
+import { CancellationToken } from '../cancellation/index.js';
 import type { StringMap } from '../types.js';
-import type { ReadonlyCancellationToken } from '../utils/cancellation-token.js';
-import { CancellationToken } from '../utils/cancellation-token.js';
 import type { Module, ModuleMetric } from './module.js';
 import { ModuleState } from './module.js';
 export declare abstract class ModuleBase implements Module {
@@ -14,5 +14,5 @@ export declare abstract class ModuleBase implements Module {
     constructor(name: string);
     run(): Promise<void>;
     stop(): Promise<void>;
-    protected abstract _run(cancellationToken: ReadonlyCancellationToken): Promise<void>;
+    protected abstract _run(cancellationSignal: CancellationSignal): Promise<void>;
 }

package/module/module-base.js

@@ -21,7 +21,7 @@ __export(module_base_exports, {
   ModuleBase: () => ModuleBase
 });
 module.exports = __toCommonJS(module_base_exports);
-var import_cancellation_token = require("../utils/cancellation-token.js");
+var import_cancellation = require("../cancellation/index.js");
 var import_module = require("./module.js");
 class ModuleBase {
   runPromise;
@@ -38,7 +38,7 @@ class ModuleBase {
     this.name = name;
     this.runPromise = Promise.resolve();
     this._state = import_module.ModuleState.Stopped;
-    this.cancellationToken = new import_cancellation_token.CancellationToken();
+    this.cancellationToken = new import_cancellation.CancellationToken();
   }
   async run() {
     if (this._state != import_module.ModuleState.Stopped) {

package/module/module-metric-reporter.d.ts

@@ -1,4 +1,4 @@
-import type { ReadonlyCancellationToken } from '../utils/cancellation-token.js';
+import type { CancellationSignal } from '../cancellation/index.js';
 import type { MetricAggregation, MetricAggregationOptions } from '../utils/moving-metric.js';
 import { MovingMetric } from '../utils/moving-metric.js';
 import type { ModuleMetric } from './module.js';
@@ -24,6 +24,6 @@ export declare class ModuleMetricReporter {
         metric: ModuleMetric;
         reports: MetricReport<MetricAggregation>[];
     }[]): void;
-    run(cancellationToken: ReadonlyCancellationToken): Promise<void>;
+    run(cancellationSignal: CancellationSignal): Promise<void>;
     private updateNameLengths;
 }

package/module/module-metric-reporter.js

@@ -51,9 +51,9 @@ class ModuleMetricReporter {
     this.metricGroups.push({ groupName, registrations });
     this.updateNameLengths();
   }
-  async run(cancellationToken) {
+  async run(cancellationSignal) {
     let counter = 0;
-    while (cancellationToken.isUnset) {
+    while (cancellationSignal.isUnset) {
       for (const { registrations } of this.metricGroups) {
         for (const { metric, moving } of registrations) {
           moving.add(metric.getValue());
@@ -71,7 +71,7 @@ class ModuleMetricReporter {
           }
         }
       }
-      await (0, import_timing.cancelableTimeout)(this.sampleInterval, cancellationToken);
+      await (0, import_timing.cancelableTimeout)(this.sampleInterval, cancellationSignal);
     }
   }
   updateNameLengths() {

package/module/modules/function.module.d.ts

@@ -1,10 +1,10 @@
-import type { ReadonlyCancellationToken } from '../../utils/cancellation-token.js';
-import type { Module } from '../module.js';
+import type { CancellationSignal } from '../../cancellation/index.js';
 import { ModuleBase } from '../module-base.js';
-export type FunctionModuleFunction = (cancellationToken: ReadonlyCancellationToken) => void | Promise<void>;
+import type { Module } from '../module.js';
+export type FunctionModuleFunction = (cancellationToken: CancellationSignal) => void | Promise<void>;
 export declare class FunctionModule extends ModuleBase implements Module {
     private readonly fn;
     readonly metrics: {};
     constructor(fn: FunctionModuleFunction, name?: string);
-    protected _run(cancellationToken: ReadonlyCancellationToken): Promise<void>;
+    protected _run(cancellationSignal: CancellationSignal): Promise<void>;
 }

package/module/modules/function.module.js

@@ -29,7 +29,7 @@ class FunctionModule extends import_module_base.ModuleBase {
     super(name);
     this.fn = fn;
   }
-  async _run(cancellationToken) {
-    return this.fn(cancellationToken);
+  async _run(cancellationSignal) {
+    return this.fn(cancellationSignal);
   }
 }

package/module/modules/web-server.module.d.ts

@@ -1,6 +1,6 @@
+import type { CancellationSignal } from '../../cancellation/index.js';
 import type { Resolvable } from '../../injector/interfaces.js';
 import { resolveArgumentType } from '../../injector/interfaces.js';
-import type { ReadonlyCancellationToken } from '../../utils/cancellation-token.js';
 import { ModuleBase } from '../module-base.js';
 import type { Module } from '../module.js';
 import { ModuleMetricType } from '../module.js';
@@ -23,6 +23,6 @@ export declare class WebServerModule extends ModuleBase implements Module, Resol
     readonly [resolveArgumentType]: WebServerModuleConfiguration;
     constructor();
     initialize(): void;
-    protected _run(cancellationToken: ReadonlyCancellationToken): Promise<void>;
+    protected _run(cancellationSignal: CancellationSignal): Promise<void>;
 }
 export declare function configureWebServerModule(config?: Partial<WebServerModuleConfiguration>): void;

package/module/modules/web-server.module.js

@@ -72,10 +72,10 @@ let WebServerModule = class WebServerModule2 extends import_module_base.ModuleBa
       this.apiGateway.registerApi((0, import_server.getApiControllerDefinition)(controller), controller);
     }
   }
-  async _run(cancellationToken) {
+  async _run(cancellationSignal) {
     this.initialize();
     await this.httpServer.listen(this.config.port);
-    const closePromise = cancellationToken.$set.then(async () => {
+    const closePromise = cancellationSignal.$set.then(async () => {
       await this.httpServer[import_disposable.disposeAsync]();
     });
     for await (const context of this.httpServer) {