@tstdl/base 0.85.26 → 0.86.0-beta10

package/message-bus/broadcast-channel/broadcast-channel-message-bus-provider.js

@@ -21,7 +21,7 @@ __export(broadcast_channel_message_bus_provider_exports, {
   BroadcastChannelMessageBusProvider: () => BroadcastChannelMessageBusProvider
 });
 module.exports = __toCommonJS(broadcast_channel_message_bus_provider_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/index.js");
 var import_logger = require("../../logger/index.js");
 var import_broadcast_channel_message_bus = require("./broadcast-channel-message-bus.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -53,7 +53,7 @@ let BroadcastChannelMessageBusProvider = class BroadcastChannelMessageBusProvide
   }
 };
 BroadcastChannelMessageBusProvider = __decorate([
-  (0, import_container.injectable)(),
-  __param(0, (0, import_container.resolveArg)("BroadcastChannelMessageBusProvider")),
+  (0, import_injector.Injectable)(),
+  __param(0, (0, import_injector.ResolveArg)("BroadcastChannelMessageBusProvider")),
   __metadata("design:paramtypes", [import_logger.Logger])
 ], BroadcastChannelMessageBusProvider);

package/message-bus/broadcast-channel/broadcast-channel-message-bus.d.ts

@@ -1,5 +1,5 @@
-import { Logger } from '../../logger/index.js';
 import type { Observable } from 'rxjs';
+import { Logger } from '../../logger/index.js';
 import { MessageBusBase } from '../message-bus-base.js';
 import type { MessageBus } from '../message-bus.js';
 /** return values wrapped in Promise for polyfills which returns promises */

package/message-bus/broadcast-channel/broadcast-channel-message-bus.js

@@ -21,10 +21,10 @@ __export(broadcast_channel_message_bus_exports, {
   BroadcastChannelMessageBus: () => BroadcastChannelMessageBus
 });
 module.exports = __toCommonJS(broadcast_channel_message_bus_exports);
-var import_container = require("../../container/index.js");
+var import_rxjs = require("rxjs");
+var import_injector = require("../../injector/index.js");
 var import_logger = require("../../logger/index.js");
 var import_type_guards = require("../../utils/type-guards.js");
-var import_rxjs = require("rxjs");
 var import_message_bus_base = require("../message-bus-base.js");
 var import_broadcast_channel_message_bus_provider = require("./broadcast-channel-message-bus-provider.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -68,7 +68,7 @@ let BroadcastChannelMessageBus = class BroadcastChannelMessageBus2 extends impor
   }
 };
 BroadcastChannelMessageBus = __decorate([
-  (0, import_container.injectable)({
+  (0, import_injector.Injectable)({
     provider: {
       useFactory: (argument, context) => {
         const channel = (0, import_type_guards.assertStringPass)(argument, "LocalMessageBus resolve argument must be a string (channel)");

package/message-bus/broadcast-channel/module.js

@@ -21,12 +21,12 @@ __export(module_exports, {
   configureBroadcastChannelMessageBus: () => configureBroadcastChannelMessageBus
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/injector.js");
 var import_message_bus_provider = require("../message-bus-provider.js");
 var import_message_bus = require("../message-bus.js");
 var import_broadcast_channel_message_bus_provider = require("./broadcast-channel-message-bus-provider.js");
 var import_broadcast_channel_message_bus = require("./broadcast-channel-message-bus.js");
 function configureBroadcastChannelMessageBus() {
-  import_container.container.register(import_message_bus.MessageBus, { useToken: import_broadcast_channel_message_bus.BroadcastChannelMessageBus });
-  import_container.container.registerSingleton(import_message_bus_provider.MessageBusProvider, { useToken: import_broadcast_channel_message_bus_provider.BroadcastChannelMessageBusProvider });
+  import_injector.Injector.register(import_message_bus.MessageBus, { useToken: import_broadcast_channel_message_bus.BroadcastChannelMessageBus });
+  import_injector.Injector.registerSingleton(import_message_bus_provider.MessageBusProvider, { useToken: import_broadcast_channel_message_bus_provider.BroadcastChannelMessageBusProvider });
 }

package/message-bus/local/local-message-bus-provider.js

@@ -21,12 +21,12 @@ __export(local_message_bus_provider_exports, {
   LocalMessageBusProvider: () => LocalMessageBusProvider
 });
 module.exports = __toCommonJS(local_message_bus_provider_exports);
-var import_container = require("../../container/index.js");
+var import_rxjs = require("rxjs");
 var import_weak_ref_map = require("../../data-structures/weak-ref-map.js");
+var import_injector = require("../../injector/index.js");
 var import_logger = require("../../logger/index.js");
 var import_factory_map = require("../../utils/factory-map.js");
 var import_type_guards = require("../../utils/type-guards.js");
-var import_rxjs = require("rxjs");
 var import_message_bus_provider = require("../message-bus-provider.js");
 var import_local_message_bus = require("./local-message-bus.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -66,7 +66,7 @@ let LocalMessageBusProvider = class LocalMessageBusProvider2 extends import_mess
   }
 };
 LocalMessageBusProvider = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.resolveArg)("LocalMessageBus")),
+  (0, import_injector.Singleton)(),
+  __param(0, (0, import_injector.ResolveArg)("LocalMessageBus")),
   __metadata("design:paramtypes", [import_logger.Logger])
 ], LocalMessageBusProvider);

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

@@ -1,6 +1,6 @@
-import { Logger } from '../../logger/index.js';
 import type { Observable } from 'rxjs';
 import { Subject } from 'rxjs';
+import { Logger } from '../../logger/index.js';
 import { MessageBusBase } from '../message-bus-base.js';
 import type { MessageBus } from '../message-bus.js';
 import type { LocalMessageBusItem } from './types.js';

package/message-bus/local/local-message-bus.js

@@ -21,10 +21,10 @@ __export(local_message_bus_exports, {
   LocalMessageBus: () => LocalMessageBus
 });
 module.exports = __toCommonJS(local_message_bus_exports);
-var import_container = require("../../container/index.js");
+var import_rxjs = require("rxjs");
+var import_injector = require("../../injector/index.js");
 var import_logger = require("../../logger/index.js");
 var import_type_guards = require("../../utils/type-guards.js");
-var import_rxjs = require("rxjs");
 var import_message_bus_base = require("../message-bus-base.js");
 var import_local_message_bus_provider = require("./local-message-bus-provider.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -59,7 +59,7 @@ let LocalMessageBus = class LocalMessageBus2 extends import_message_bus_base.Mes
   }
 };
 LocalMessageBus = __decorate([
-  (0, import_container.injectable)({
+  (0, import_injector.Injectable)({
     provider: {
       useFactory: (argument, context) => {
         const channel = (0, import_type_guards.assertStringPass)(argument, "LocalMessageBus resolve argument must be a string (channel)");

package/message-bus/local/module.js

@@ -21,12 +21,12 @@ __export(module_exports, {
   configureLocalMessageBus: () => configureLocalMessageBus
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/injector.js");
 var import_message_bus_provider = require("../message-bus-provider.js");
 var import_message_bus = require("../message-bus.js");
 var import_local_message_bus_provider = require("./local-message-bus-provider.js");
 var import_local_message_bus = require("./local-message-bus.js");
 function configureLocalMessageBus() {
-  import_container.container.register(import_message_bus.MessageBus, { useToken: import_local_message_bus.LocalMessageBus });
-  import_container.container.registerSingleton(import_message_bus_provider.MessageBusProvider, { useToken: import_local_message_bus_provider.LocalMessageBusProvider });
+  import_injector.Injector.register(import_message_bus.MessageBus, { useToken: import_local_message_bus.LocalMessageBus });
+  import_injector.Injector.registerSingleton(import_message_bus_provider.MessageBusProvider, { useToken: import_local_message_bus_provider.LocalMessageBusProvider });
 }

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

@@ -1,10 +1,10 @@
-import type { Injectable } from '../container/index.js';
-import type { resolveArgumentType } from '../container/index.js';
 import type { Observable } from 'rxjs';
+import type { Resolvable } from '../injector/interfaces.js';
+import { resolveArgumentType } from '../injector/interfaces.js';
 import type { AsyncDisposable } from '../disposable/disposable.js';
 import { disposeAsync } from '../disposable/disposable.js';
 export type MessageBusArgument = string;
-export declare abstract class MessageBus<T> implements AsyncDisposable, Injectable<MessageBusArgument> {
+export declare abstract class MessageBus<T> implements AsyncDisposable, Resolvable<MessageBusArgument> {
     readonly [resolveArgumentType]: string;
     /** messages from other instances */
     abstract readonly messages$: Observable<T>;

package/message-bus/message-bus.js

@@ -21,6 +21,7 @@ __export(message_bus_exports, {
   MessageBus: () => MessageBus
 });
 module.exports = __toCommonJS(message_bus_exports);
+var import_interfaces = require("../injector/interfaces.js");
 var import_disposable = require("../disposable/disposable.js");
 class MessageBus {
   async dispose() {

package/migration/index.d.ts

@@ -1,3 +1,3 @@
-export * from './migration-state.js';
 export * from './migration-state-repository.js';
+export * from './migration-state.js';
 export * from './migrator.js';

package/migration/index.js

@@ -15,6 +15,6 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var migration_exports = {};
 module.exports = __toCommonJS(migration_exports);
-__reExport(migration_exports, require("./migration-state.js"), module.exports);
 __reExport(migration_exports, require("./migration-state-repository.js"), module.exports);
+__reExport(migration_exports, require("./migration-state.js"), module.exports);
 __reExport(migration_exports, require("./migrator.js"), module.exports);

package/migration/migrator.js

@@ -21,7 +21,7 @@ __export(migrator_exports, {
   Migrator: () => Migrator
 });
 module.exports = __toCommonJS(migrator_exports);
-var import_container = require("../container/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");
@@ -109,8 +109,8 @@ let Migrator = class Migrator2 {
   }
 };
 Migrator = __decorate([
-  (0, import_container.singleton)(),
-  __param(1, (0, import_container.resolveArg)("migrator:")),
-  __param(2, (0, import_container.resolveArg)("Migrator")),
+  (0, import_injector.Singleton)(),
+  __param(1, (0, import_injector.ResolveArg)("migrator:")),
+  __param(2, (0, import_injector.ResolveArg)("Migrator")),
   __metadata("design:paramtypes", [import_migration_state_repository.MigrationStateRepository, import_lock.LockProvider, import_logger.Logger])
 ], Migrator);

package/migration/mongo/migration-state-repository.d.ts

@@ -1,11 +1,11 @@
-import type { Injectable } from '../../container/index.js';
-import { type resolveArgumentType } from '../../container/index.js';
+import type { Resolvable } from '../../injector/index.js';
+import { resolveArgumentType } from '../../injector/index.js';
 import { Logger } from '../../logger/index.js';
 import type { MigrationState, MigrationStateRepository } from '../../migration/index.js';
 import type { CollectionArgument } from '../../database/mongo/classes.js';
 import { Collection } from '../../database/mongo/classes.js';
 import { MongoEntityRepository } from '../../database/mongo/mongo-entity-repository.js';
-export declare class MongoMigrationStateRepository extends MongoEntityRepository<MigrationState> implements MigrationStateRepository, Injectable<CollectionArgument<MigrationState>> {
+export declare class MongoMigrationStateRepository extends MongoEntityRepository<MigrationState> implements MigrationStateRepository, Resolvable<CollectionArgument<MigrationState>> {
     readonly [resolveArgumentType]: CollectionArgument<MigrationState>;
     constructor(collection: Collection<MigrationState>, logger: Logger);
 }

package/migration/mongo/migration-state-repository.js

@@ -21,7 +21,7 @@ __export(migration_state_repository_exports, {
   MongoMigrationStateRepository: () => MongoMigrationStateRepository
 });
 module.exports = __toCommonJS(migration_state_repository_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/index.js");
 var import_logger = require("../../logger/index.js");
 var import_classes = require("../../database/mongo/classes.js");
 var import_mongo_entity_repository = require("../../database/mongo/mongo-entity-repository.js");
@@ -54,8 +54,8 @@ let MongoMigrationStateRepository = class MongoMigrationStateRepository2 extends
   }
 };
 MongoMigrationStateRepository = __decorate([
-  (0, import_container.singleton)({ defaultArgumentProvider: () => import_module.mongoMigrationStateRepositoryModuleConfig.defaultMigrationStateRepositoryConfig }),
-  __param(0, (0, import_container.forwardArg)()),
-  __param(1, (0, import_container.resolveArg)("MongoMigrationStateRepository")),
+  (0, import_injector.Singleton)({ defaultArgumentProvider: () => import_module.mongoMigrationStateRepositoryModuleConfig.defaultMigrationStateRepositoryConfig }),
+  __param(0, (0, import_injector.ForwardArg)()),
+  __param(1, (0, import_injector.ResolveArg)("MongoMigrationStateRepository")),
   __metadata("design:paramtypes", [import_classes.Collection, import_logger.Logger])
 ], MongoMigrationStateRepository);

package/migration/mongo/module.js

@@ -22,7 +22,7 @@ __export(module_exports, {
   mongoMigrationStateRepositoryModuleConfig: () => mongoMigrationStateRepositoryModuleConfig
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/injector.js");
 var import_migration_state_repository = require("../../migration/migration-state-repository.js");
 var import_migration_state_repository2 = require("./migration-state-repository.js");
 const mongoMigrationStateRepositoryModuleConfig = {
@@ -31,6 +31,6 @@ const mongoMigrationStateRepositoryModuleConfig = {
 function configureMongoMigrationStateRepository(migrationStateRepositoryConfig, register = true) {
   mongoMigrationStateRepositoryModuleConfig.defaultMigrationStateRepositoryConfig = migrationStateRepositoryConfig;
   if (register) {
-    import_container.container.registerSingleton(import_migration_state_repository.MigrationStateRepository, { useToken: import_migration_state_repository2.MongoMigrationStateRepository });
+    import_injector.Injector.registerSingleton(import_migration_state_repository.MigrationStateRepository, { useToken: import_migration_state_repository2.MongoMigrationStateRepository });
   }
 }

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

@@ -1,8 +1,5 @@
-import { ApiGateway } from '../../api/server/index.js';
-import type { AfterResolve, Injectable } from '../../container/index.js';
-import { afterResolve, type resolveArgumentType } from '../../container/index.js';
-import { HttpServer } from '../../http/server/http-server.js';
-import type { Type } from '../../types.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';
@@ -11,7 +8,7 @@ export type WebServerModuleConfiguration = {
     port: number;
 };
 export declare const webServerModuleConfiguration: WebServerModuleConfiguration;
-export declare class WebServerModule extends ModuleBase implements Module, Injectable<WebServerModuleConfiguration>, AfterResolve {
+export declare class WebServerModule extends ModuleBase implements Module, Resolvable<WebServerModuleConfiguration> {
     private readonly config;
     private readonly httpServer;
     private readonly apiGateway;
@@ -24,10 +21,8 @@ export declare class WebServerModule extends ModuleBase implements Module, Injec
         };
     };
     readonly [resolveArgumentType]: WebServerModuleConfiguration;
-    constructor(config: WebServerModuleConfiguration, httpServer: HttpServer, apiGateway: ApiGateway, apiControllers?: Type[]);
-    initialize(): Promise<void>;
-    [afterResolve](): Promise<void>;
-    registerApiController(controller: Type): Promise<void>;
+    constructor();
+    initialize(): void;
     protected _run(cancellationToken: ReadonlyCancellationToken): Promise<void>;
 }
 export declare function configureWebServerModule(config?: Partial<WebServerModuleConfiguration>): void;

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

@@ -24,9 +24,12 @@ __export(web_server_module_exports, {
 });
 module.exports = __toCommonJS(web_server_module_exports);
 var import_server = require("../../api/server/index.js");
-var import_container = require("../../container/index.js");
+var import_log = require("../../decorators/log.js");
 var import_disposable = require("../../disposable/disposable.js");
 var import_http_server = require("../../http/server/http-server.js");
+var import_decorators = require("../../injector/decorators.js");
+var import_inject = require("../../injector/inject.js");
+var import_interfaces = require("../../injector/interfaces.js");
 var import_module_base = require("../module-base.js");
 var import_module = require("../module.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -43,51 +46,35 @@ var __metadata = function(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
     return Reflect.metadata(k, v);
 };
-var __param = function(paramIndex, decorator) {
-  return function(target, key) {
-    decorator(target, key, paramIndex);
-  };
-};
 const webServerModuleConfiguration = {
   port: 8e3
 };
 let WebServerModule = class WebServerModule2 extends import_module_base.ModuleBase {
-  config;
-  httpServer;
-  apiGateway;
-  apiControllers;
-  initialized;
+  config = (0, import_inject.injectArgument)(this);
+  httpServer = (0, import_inject.inject)(import_http_server.HttpServer);
+  apiGateway = (0, import_inject.inject)(import_server.ApiGateway);
+  apiControllers = (0, import_inject.inject)(import_server.API_CONTROLLERS);
+  initialized = false;
   metrics = {
     connectedSockets: {
       type: import_module.ModuleMetricType.Gauge,
       getValue: () => this.httpServer.connectedSocketsCount
     }
   };
-  constructor(config, httpServer, apiGateway, apiControllers = []) {
+  constructor() {
     super("WebServer");
-    this.httpServer = httpServer;
-    this.apiGateway = apiGateway;
-    this.config = config;
-    this.apiControllers = apiControllers;
-    this.initialized = false;
   }
-  async initialize() {
+  initialize() {
     if (this.initialized) {
       return;
     }
     this.initialized = true;
     for (const controller of this.apiControllers) {
-      await this.registerApiController(controller);
+      this.apiGateway.registerApi((0, import_server.getApiControllerDefinition)(controller), controller);
     }
   }
-  async [import_container.afterResolve]() {
-    await this.initialize();
-  }
-  async registerApiController(controller) {
-    await this.apiGateway.registerApiController(controller);
-  }
   async _run(cancellationToken) {
-    await this.initialize();
+    this.initialize();
     await this.httpServer.listen(this.config.port);
     const closePromise = cancellationToken.$set.then(async () => {
       await this.httpServer[import_disposable.disposeAsync]();
@@ -99,16 +86,9 @@ let WebServerModule = class WebServerModule2 extends import_module_base.ModuleBa
   }
 };
 WebServerModule = __decorate([
-  (0, import_container.singleton)({ defaultArgumentProvider: () => webServerModuleConfiguration }),
-  __param(0, (0, import_container.injectArg)()),
-  __param(3, (0, import_container.inject)(import_server.API_MODULE_OPTIONS, void 0, (options) => options.controllers)),
-  __param(3, (0, import_container.optional)()),
-  __metadata("design:paramtypes", [
-    Object,
-    import_http_server.HttpServer,
-    import_server.ApiGateway,
-    Array
-  ])
+  (0, import_decorators.Singleton)({ defaultArgumentProvider: () => webServerModuleConfiguration }),
+  (0, import_log.Log)(),
+  __metadata("design:paramtypes", [])
 ], WebServerModule);
 function configureWebServerModule(config) {
   webServerModuleConfiguration.port = config?.port ?? webServerModuleConfiguration.port;

package/notification/notification.service.js

@@ -21,7 +21,7 @@ __export(notification_service_exports, {
   NotificationService: () => NotificationService
 });
 module.exports = __toCommonJS(notification_service_exports);
-var import_container = require("../container/index.js");
+var import_decorators = require("../injector/decorators.js");
 var import_date_time = require("../utils/date-time.js");
 var import_notification_repository = require("./notification.repository.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -58,6 +58,6 @@ let NotificationService = class NotificationService2 {
   }
 };
 NotificationService = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [import_notification_repository.NotificationRepository])
 ], NotificationService);

package/object-storage/object-storage.d.ts

@@ -1,11 +1,11 @@
-import type { Injectable } from '../container/index.js';
-import type { resolveArgumentType } from '../container/index.js';
+import type { Resolvable } from '../injector/interfaces.js';
+import { resolveArgumentType } from '../injector/interfaces.js';
 import type { ObjectMetadata, ObjectStorageObject } from './object.js';
 export type UploadObjectOptions = {
     metadata?: ObjectMetadata;
 };
 export type ObjectStorageArgument = string;
-export declare abstract class ObjectStorage implements Injectable<ObjectStorageArgument> {
+export declare abstract class ObjectStorage implements Resolvable<ObjectStorageArgument> {
     /** object storage module */
     readonly module: string;
     readonly [resolveArgumentType]: ObjectStorageArgument;

package/object-storage/object-storage.js

@@ -21,6 +21,7 @@ __export(object_storage_exports, {
   ObjectStorage: () => ObjectStorage
 });
 module.exports = __toCommonJS(object_storage_exports);
+var import_interfaces = require("../injector/interfaces.js");
 class ObjectStorage {
   /** object storage module */
   module;

package/object-storage/s3/s3.object-storage-provider.js

@@ -24,7 +24,8 @@ __export(s3_object_storage_provider_exports, {
   configureS3ObjectStorage: () => configureS3ObjectStorage
 });
 module.exports = __toCommonJS(s3_object_storage_provider_exports);
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
+var import_injector = require("../../injector/injector.js");
 var import_object_storage = require("../../object-storage/index.js");
 var import_type_guards = require("../../utils/type-guards.js");
 var import_minio = require("minio");
@@ -105,13 +106,13 @@ let S3ObjectStorageProvider = class S3ObjectStorageProvider2 extends import_obje
   }
 };
 S3ObjectStorageProvider = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [S3ObjectStorageProviderConfig])
 ], S3ObjectStorageProvider);
 function configureS3ObjectStorage(config, register = true) {
-  import_container.container.register(S3ObjectStorageProviderConfig, { useValue: config });
+  import_injector.Injector.register(S3ObjectStorageProviderConfig, { useValue: config });
   if (register) {
-    import_container.container.registerSingleton(import_object_storage.ObjectStorageProvider, { useToken: S3ObjectStorageProvider });
-    import_container.container.registerSingleton(import_object_storage.ObjectStorage, { useToken: import_s3_object_storage.S3ObjectStorage });
+    import_injector.Injector.registerSingleton(import_object_storage.ObjectStorageProvider, { useToken: S3ObjectStorageProvider });
+    import_injector.Injector.registerSingleton(import_object_storage.ObjectStorage, { useToken: import_s3_object_storage.S3ObjectStorage });
   }
 }

package/object-storage/s3/s3.object-storage.d.ts

@@ -1,7 +1,7 @@
-import type { UploadObjectOptions } from '../../object-storage/index.js';
-import { ObjectStorage } from '../../object-storage/index.js';
 import type { BucketItemStat } from 'minio';
 import { Client } from 'minio';
+import type { UploadObjectOptions } from '../../object-storage/index.js';
+import { ObjectStorage } from '../../object-storage/index.js';
 import { S3Object } from './s3.object.js';
 export declare class S3ObjectStorage extends ObjectStorage {
     private readonly client;

package/object-storage/s3/s3.object-storage.js

@@ -21,7 +21,9 @@ __export(s3_object_storage_exports, {
   S3ObjectStorage: () => S3ObjectStorage
 });
 module.exports = __toCommonJS(s3_object_storage_exports);
-var import_container = require("../../container/index.js");
+var import_minio = require("minio");
+var import_node_stream = require("node:stream");
+var import_decorators = require("../../injector/decorators.js");
 var import_object_storage = require("../../object-storage/index.js");
 var import_map = require("../../utils/async-iterable-helpers/map.js");
 var import_to_array = require("../../utils/async-iterable-helpers/to-array.js");
@@ -29,8 +31,6 @@ var import_date_time = require("../../utils/date-time.js");
 var import_stream = require("../../utils/stream/index.js");
 var import_stream_reader = require("../../utils/stream/stream-reader.js");
 var import_type_guards = require("../../utils/type-guards.js");
-var import_minio = require("minio");
-var import_node_stream = require("node:stream");
 var import_s3_object_storage_provider = require("./s3.object-storage-provider.js");
 var import_s3_object = require("./s3.object.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -150,7 +150,7 @@ let S3ObjectStorage = class S3ObjectStorage2 extends import_object_storage.Objec
   }
 };
 S3ObjectStorage = __decorate([
-  (0, import_container.singleton)({
+  (0, import_decorators.Singleton)({
     provider: {
       useFactory: async (argument, context) => context.resolve(import_s3_object_storage_provider.S3ObjectStorageProvider).get((0, import_type_guards.assertStringPass)(argument, "resolve argument must be a string (object storage module)"))
     }

package/openid-connect/cached-oidc-configuration.service.js

@@ -21,8 +21,8 @@ __export(cached_oidc_configuration_service_exports, {
   CachedOidcConfigurationService: () => CachedOidcConfigurationService
 });
 module.exports = __toCommonJS(cached_oidc_configuration_service_exports);
-var import_container = require("../container/index.js");
 var import_http_client = require("../http/client/http-client.js");
+var import_injector = require("../injector/index.js");
 var import_date_time = require("../utils/date-time.js");
 var import_type_guards = require("../utils/type-guards.js");
 var import_units = require("../utils/units.js");
@@ -66,7 +66,7 @@ let CachedOidcConfigurationService = class CachedOidcConfigurationService2 exten
   }
 };
 CachedOidcConfigurationService = __decorate([
-  (0, import_container.singleton)(),
-  __param(1, (0, import_container.optional)()),
+  (0, import_injector.Singleton)(),
+  __param(1, (0, import_injector.Optional)()),
   __metadata("design:paramtypes", [import_http_client.HttpClient, Number])
 ], CachedOidcConfigurationService);

package/openid-connect/index.d.ts

@@ -3,5 +3,5 @@ export * from './mongo-oidc-state.repository.js';
 export * from './oidc-configuration.service.js';
 export * from './oidc-state.model.js';
 export * from './oidc-state.repository.js';
-export * from './oidc.service.js';
 export * from './oidc.service-model.js';
+export * from './oidc.service.js';

package/openid-connect/index.js

@@ -15,7 +15,7 @@ var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "defau
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var openid_connect_exports = {};
 module.exports = __toCommonJS(openid_connect_exports);
-var import_container = require("../container/index.js");
+var import_injector = require("../injector/injector.js");
 var import_cached_oidc_configuration_service = require("./cached-oidc-configuration.service.js");
 var import_oidc_configuration_service = require("./oidc-configuration.service.js");
 __reExport(openid_connect_exports, require("./cached-oidc-configuration.service.js"), module.exports);
@@ -23,6 +23,6 @@ __reExport(openid_connect_exports, require("./mongo-oidc-state.repository.js"),
 __reExport(openid_connect_exports, require("./oidc-configuration.service.js"), module.exports);
 __reExport(openid_connect_exports, require("./oidc-state.model.js"), module.exports);
 __reExport(openid_connect_exports, require("./oidc-state.repository.js"), module.exports);
-__reExport(openid_connect_exports, require("./oidc.service.js"), module.exports);
 __reExport(openid_connect_exports, require("./oidc.service-model.js"), module.exports);
-import_container.container.registerSingleton(import_oidc_configuration_service.OidcConfigurationService, { useToken: import_cached_oidc_configuration_service.CachedOidcConfigurationService });
+__reExport(openid_connect_exports, require("./oidc.service.js"), module.exports);
+import_injector.Injector.registerSingleton(import_oidc_configuration_service.OidcConfigurationService, { useToken: import_cached_oidc_configuration_service.CachedOidcConfigurationService });

package/openid-connect/mongo-oidc-state.repository.d.ts

@@ -1,7 +1,7 @@
-import type { Injectable } from '../container/index.js';
-import { type resolveArgumentType } from '../container/index.js';
 import type { CollectionArgument, MongoRepositoryConfig } from '../database/mongo/index.js';
 import { Collection, MongoEntityRepository } from '../database/mongo/index.js';
+import type { Resolvable } from '../injector/index.js';
+import { resolveArgumentType } from '../injector/index.js';
 import { Logger } from '../logger/index.js';
 import type { TypedOmit } from '../types.js';
 import type { OidcState } from './oidc-state.model.js';
@@ -9,7 +9,7 @@ import { OidcStateRepository } from './oidc-state.repository.js';
 export type MongoOidcState = TypedOmit<OidcState, 'expiration'> & {
     expiration: Date;
 };
-export declare class MongoOidcStateRepository extends MongoEntityRepository<OidcState, MongoOidcState> implements OidcStateRepository, Injectable<CollectionArgument<MongoOidcState>> {
+export declare class MongoOidcStateRepository extends MongoEntityRepository<OidcState, MongoOidcState> implements OidcStateRepository, Resolvable<CollectionArgument<MongoOidcState>> {
     readonly [resolveArgumentType]: CollectionArgument<MongoOidcState>;
     constructor(collection: Collection<MongoOidcState>, logger: Logger);
 }

package/openid-connect/mongo-oidc-state.repository.js

@@ -22,8 +22,9 @@ __export(mongo_oidc_state_repository_exports, {
   configureMongoOidcStateRepository: () => configureMongoOidcStateRepository
 });
 module.exports = __toCommonJS(mongo_oidc_state_repository_exports);
-var import_container = require("../container/index.js");
 var import_mongo = require("../database/mongo/index.js");
+var import_injector = require("../injector/index.js");
+var import_injector2 = require("../injector/injector.js");
 var import_logger = require("../logger/index.js");
 var import_oidc_state_repository = require("./oidc-state.repository.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -63,14 +64,14 @@ let MongoOidcStateRepository = class MongoOidcStateRepository2 extends import_mo
   }
 };
 MongoOidcStateRepository = __decorate([
-  (0, import_container.singleton)({ defaultArgumentProvider: () => repositoryConfig }),
-  __param(0, (0, import_container.forwardArg)()),
-  __param(1, (0, import_container.resolveArg)("MongoOidcStateRepository")),
+  (0, import_injector.Singleton)({ defaultArgumentProvider: () => repositoryConfig }),
+  __param(0, (0, import_injector.ForwardArg)()),
+  __param(1, (0, import_injector.ResolveArg)("MongoOidcStateRepository")),
   __metadata("design:paramtypes", [import_mongo.Collection, import_logger.Logger])
 ], MongoOidcStateRepository);
 function configureMongoOidcStateRepository(mongoOidcStateRepositoryConfig, register = true) {
   repositoryConfig = mongoOidcStateRepositoryConfig;
   if (register) {
-    import_container.container.registerSingleton(import_oidc_state_repository.OidcStateRepository, { useToken: MongoOidcStateRepository });
+    import_injector2.Injector.registerSingleton(import_oidc_state_repository.OidcStateRepository, { useToken: MongoOidcStateRepository });
   }
 }

package/openid-connect/oidc-configuration.service.js

@@ -21,7 +21,7 @@ __export(oidc_configuration_service_exports, {
   OidcConfigurationService: () => OidcConfigurationService
 });
 module.exports = __toCommonJS(oidc_configuration_service_exports);
-var import_container = require("../container/index.js");
+var import_decorators = require("../injector/decorators.js");
 var import_client = require("../http/client/index.js");
 var import_schema = require("../schema/index.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -67,6 +67,6 @@ let OidcConfigurationService = class OidcConfigurationService2 {
   }
 };
 OidcConfigurationService = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [import_client.HttpClient])
 ], OidcConfigurationService);