@tstdl/base 0.85.26 → 0.86.0-beta10

package/injector/types.d.ts

@@ -1,3 +1,4 @@
+import type { AsyncDisposeHandler } from '../disposable/async-disposer.js';
 import type { Record } from '../types.js';
 import type { Injector } from './injector.js';
 import type { ResolveArgument } from './interfaces.js';
@@ -9,21 +10,28 @@ import type { InjectionToken } from './token.js';
  * singleton: one resolution at injector where token is registered
  */
 export type Lifecycle = 'transient' | 'resolution' | 'injector' | 'singleton';
-export type ResolveContext = Pick<Injector, 'resolve' | 'resolveAll'>;
+export type ResolveContext<C extends Record> = Pick<Injector, 'resolve' | 'resolveAll'> & {
+    context: ResolutionContext<C>;
+    addDisposeHandler(handler: AsyncDisposeHandler): void;
+};
 export type Mapper<T = any, U = unknown> = (value: T) => U;
-export type ArgumentProvider<T = unknown> = (context: ResolveContext) => T;
+export type ArgumentProvider<T = unknown, C extends Record = Record> = (context: ResolveContext<C>) => T;
 export type ForwardRefInjectionToken<T = any, A = any> = Exclude<InjectionToken<T, A>, Function> | (() => InjectionToken<T, A>);
 export type ResolveOptions = {
     optional?: boolean;
     skipSelf?: boolean;
     onlySelf?: boolean;
 };
-export type RegistrationOptions<T, A = unknown> = {
+/**
+ * data to store between different stages like resolve and afterResolve
+ */
+export type ResolutionContext<T extends Record> = T;
+export type RegistrationOptions<T, A = unknown, C extends Record = Record> = {
     lifecycle?: Lifecycle;
     /** Default resolve argument used when neither token nor explicit resolve argument is provided */
     defaultArgument?: ResolveArgument<T, A>;
     /** Default resolve argument used when neither token nor explicit resolve argument is provided */
-    defaultArgumentProvider?: ArgumentProvider<ResolveArgument<T, A>>;
+    defaultArgumentProvider?: ArgumentProvider<ResolveArgument<T, A>, C>;
     /**
      * Value to distinguish scoped and singleton instances based on argument
      * by default it uses strict equality (===) on the original argument,
@@ -35,9 +43,7 @@ export type RegistrationOptions<T, A = unknown> = {
      */
     argumentIdentityProvider?: Mapper<ResolveArgument<T, A>>;
     /** Function which gets called after a resolve */
-    afterResolve?: (instance: T, argument: ResolveArgument<T, A>) => any;
+    afterResolve?: (instance: T, argument: ResolveArgument<T, A>, context: ResolutionContext<C>) => any;
     /** Whether multiple values can be resolved or not (used with {@link Injector.resolveAll}). If false, previous registrations are removed */
     multi?: boolean;
-    /** Custom metadata */
-    metadata?: Record;
 };

package/key-value-store/key-value.store.d.ts

@@ -1,9 +1,9 @@
-import type { Injectable } from '../container/index.js';
-import { resolveArgumentType } from '../container/index.js';
+import type { Resolvable } from '../injector/interfaces.js';
+import { resolveArgumentType } from '../injector/interfaces.js';
 import type { StringMap } from '../types.js';
 /** key value store module */
 export type KeyValueStoreArgument = string;
-export declare abstract class KeyValueStore<KV extends StringMap> implements Injectable<KeyValueStoreArgument> {
+export declare abstract class KeyValueStore<KV extends StringMap> implements Resolvable<KeyValueStoreArgument> {
     readonly module: string;
     readonly [resolveArgumentType]: KeyValueStoreArgument;
     constructor(module: string);

package/key-value-store/key-value.store.js

@@ -21,7 +21,7 @@ __export(key_value_store_exports, {
   KeyValueStore: () => KeyValueStore
 });
 module.exports = __toCommonJS(key_value_store_exports);
-var import_container = require("../container/index.js");
+var import_interfaces = require("../injector/interfaces.js");
 class KeyValueStore {
   module;
   constructor(module2) {

package/key-value-store/mongo/module.js

@@ -21,16 +21,16 @@ __export(module_exports, {
   configureMongoKeyValueStore: () => configureMongoKeyValueStore
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/injector.js");
 var import_key_value_store_provider = require("../key-value-store.provider.js");
 var import_key_value_store = require("../key-value.store.js");
 var import_mongo_key_value_store_provider = require("./mongo-key-value-store.provider.js");
 var import_mongo_key_value_store = require("./mongo-key-value.store.js");
 var import_tokens = require("./tokens.js");
 function configureMongoKeyValueStore(keyValueRepositoryConfig, register = true) {
-  import_container.container.register(import_tokens.DEFAULT_KEY_VALUE_REPOSITORY_CONFIG, { useValue: keyValueRepositoryConfig });
+  import_injector.Injector.register(import_tokens.DEFAULT_KEY_VALUE_REPOSITORY_CONFIG, { useValue: keyValueRepositoryConfig });
   if (register) {
-    import_container.container.registerSingleton(import_key_value_store_provider.KeyValueStoreProvider, { useToken: import_mongo_key_value_store_provider.MongoKeyValueStoreProvider });
-    import_container.container.registerSingleton(import_key_value_store.KeyValueStore, { useToken: import_mongo_key_value_store.MongoKeyValueStore, argument: "" });
+    import_injector.Injector.registerSingleton(import_key_value_store_provider.KeyValueStoreProvider, { useToken: import_mongo_key_value_store_provider.MongoKeyValueStoreProvider });
+    import_injector.Injector.registerSingleton(import_key_value_store.KeyValueStore, { useToken: import_mongo_key_value_store.MongoKeyValueStore, defaultArgument: "" });
   }
 }

package/key-value-store/mongo/mongo-key-value-store.provider.js

@@ -21,7 +21,7 @@ __export(mongo_key_value_store_provider_exports, {
   MongoKeyValueStoreProvider: () => MongoKeyValueStoreProvider
 });
 module.exports = __toCommonJS(mongo_key_value_store_provider_exports);
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
 var import_mongo_key_value_repository = require("./mongo-key-value.repository.js");
 var import_mongo_key_value_store = require("./mongo-key-value.store.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -48,6 +48,6 @@ let MongoKeyValueStoreProvider = class MongoKeyValueStoreProvider2 {
   }
 };
 MongoKeyValueStoreProvider = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [import_mongo_key_value_repository.MongoKeyValueRepository])
 ], MongoKeyValueStoreProvider);

package/key-value-store/mongo/mongo-key-value.repository.d.ts

@@ -1,10 +1,10 @@
-import type { Injectable } from '../../container/index.js';
-import { type resolveArgumentType } from '../../container/index.js';
 import type { CollectionArgument } from '../../database/mongo/index.js';
 import { Collection, MongoEntityRepository } from '../../database/mongo/index.js';
+import { resolveArgumentType } from '../../injector/index.js';
+import type { Resolvable } from '../../injector/interfaces.js';
 import { Logger } from '../../logger/index.js';
 import type { MongoKeyValue } from './mongo-key-value.model.js';
-export declare class MongoKeyValueRepository extends MongoEntityRepository<MongoKeyValue> implements Injectable<CollectionArgument<MongoKeyValue>> {
+export declare class MongoKeyValueRepository extends MongoEntityRepository<MongoKeyValue> implements Resolvable<CollectionArgument<MongoKeyValue>> {
     readonly [resolveArgumentType]: CollectionArgument<MongoKeyValue, MongoKeyValue>;
     constructor(collection: Collection<MongoKeyValue>, logger: Logger);
 }

package/key-value-store/mongo/mongo-key-value.repository.js

@@ -21,8 +21,8 @@ __export(mongo_key_value_repository_exports, {
   MongoKeyValueRepository: () => MongoKeyValueRepository
 });
 module.exports = __toCommonJS(mongo_key_value_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_logger = require("../../logger/index.js");
 var import_tokens = require("./tokens.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -53,8 +53,8 @@ let MongoKeyValueRepository = class MongoKeyValueRepository2 extends import_mong
   }
 };
 MongoKeyValueRepository = __decorate([
-  (0, import_container.singleton)({ defaultArgumentProvider: (context) => context.resolve(import_tokens.DEFAULT_KEY_VALUE_REPOSITORY_CONFIG) }),
-  __param(0, (0, import_container.forwardArg)()),
-  __param(1, (0, import_container.resolveArg)("MongoKeyValueRepository")),
+  (0, import_injector.Singleton)({ defaultArgumentProvider: (context) => context.resolve(import_tokens.DEFAULT_KEY_VALUE_REPOSITORY_CONFIG) }),
+  __param(0, (0, import_injector.ForwardArg)()),
+  __param(1, (0, import_injector.ResolveArg)("MongoKeyValueRepository")),
   __metadata("design:paramtypes", [import_mongo.Collection, import_logger.Logger])
 ], MongoKeyValueRepository);

package/key-value-store/mongo/mongo-key-value.store.js

@@ -21,8 +21,8 @@ __export(mongo_key_value_store_exports, {
   MongoKeyValueStore: () => MongoKeyValueStore
 });
 module.exports = __toCommonJS(mongo_key_value_store_exports);
-var import_container = require("../../container/index.js");
 var import_database = require("../../database/index.js");
+var import_injector = require("../../injector/index.js");
 var import_key_value_store = require("../../key-value-store/index.js");
 var import_date_time = require("../../utils/date-time.js");
 var import_object = require("../../utils/object/object.js");
@@ -91,7 +91,7 @@ let MongoKeyValueStore = class MongoKeyValueStore2 extends import_key_value_stor
   }
 };
 MongoKeyValueStore = __decorate([
-  (0, import_container.singleton)(),
-  __param(1, (0, import_container.injectArg)((argument) => (0, import_type_guards.assertStringPass)(argument, "key-value store argument missing (module)"))),
+  (0, import_injector.Singleton)(),
+  __param(1, (0, import_injector.InjectArg)((argument) => (0, import_type_guards.assertStringPass)(argument, "key-value store argument missing (module)"))),
   __metadata("design:paramtypes", [import_mongo_key_value_repository.MongoKeyValueRepository, String])
 ], MongoKeyValueStore);

package/key-value-store/mongo/tokens.d.ts

@@ -1,3 +1,3 @@
 import type { MongoRepositoryConfig } from '../../database/mongo/types.js';
 import type { MongoKeyValue } from './mongo-key-value.model.js';
-export declare const DEFAULT_KEY_VALUE_REPOSITORY_CONFIG: import("../../container/token.js").InjectionToken<MongoRepositoryConfig<MongoKeyValue>, any>;
+export declare const DEFAULT_KEY_VALUE_REPOSITORY_CONFIG: import("../../injector/token.js").InjectionToken<MongoRepositoryConfig<MongoKeyValue>, never>;

package/key-value-store/mongo/tokens.js

@@ -21,5 +21,5 @@ __export(tokens_exports, {
   DEFAULT_KEY_VALUE_REPOSITORY_CONFIG: () => DEFAULT_KEY_VALUE_REPOSITORY_CONFIG
 });
 module.exports = __toCommonJS(tokens_exports);
-var import_token = require("../../container/token.js");
+var import_token = require("../../injector/token.js");
 const DEFAULT_KEY_VALUE_REPOSITORY_CONFIG = (0, import_token.injectionToken)("default key value repository config");

package/lock/lock.d.ts

@@ -1,4 +1,5 @@
-import type { Injectable, resolveArgumentType } from '../container/index.js';
+import type { Resolvable } from '../injector/index.js';
+import { resolveArgumentType } from '../injector/index.js';
 export type LockedFunction<R> = (controller: LockController) => R | Promise<R>;
 export type AcquireResult<Throw extends boolean> = Throw extends true ? LockController : (LockController | false);
 export type UsingResult<Throw extends boolean, R> = Throw extends true ? ({
@@ -25,7 +26,7 @@ export type LockArgument = string | {
     prefix?: string;
     resource: string;
 };
-export declare abstract class Lock implements Injectable<LockArgument> {
+export declare abstract class Lock implements Resolvable<LockArgument> {
     readonly resource: string;
     readonly [resolveArgumentType]: LockArgument;
     constructor(resource: string);

package/lock/lock.js

@@ -21,6 +21,7 @@ __export(lock_exports, {
   Lock: () => Lock
 });
 module.exports = __toCommonJS(lock_exports);
+var import_injector = require("../injector/index.js");
 class Lock {
   resource;
   constructor(resource) {

package/lock/mongo/lock.js

@@ -21,7 +21,7 @@ __export(lock_exports, {
   MongoLock: () => MongoLock
 });
 module.exports = __toCommonJS(lock_exports);
-var import_container = require("../../container/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");
@@ -131,13 +131,13 @@ let MongoLock = class MongoLock2 extends import_lock.Lock {
   }
 };
 MongoLock = __decorate([
-  (0, import_container.injectable)({
+  (0, import_decorators.Injectable)({
     provider: {
-      useFactory: async (argument, context) => {
+      useFactory: (argument, context) => {
         const arg = argument;
         const prefix = (0, import_type_guards.isObject)(arg) ? (0, import_type_guards.assertStringPass)(arg.prefix, "invalid lock argument") : void 0;
         const resource = (0, import_type_guards.assertStringPass)((0, import_type_guards.isObject)(arg) ? arg.resource : arg, "invalid lock argument");
-        const provider = await context.resolveAsync(import_provider.MongoLockProvider, prefix);
+        const provider = context.resolve(import_provider.MongoLockProvider, prefix);
         return provider.get(resource);
       }
     }

package/lock/mongo/module.js

@@ -22,7 +22,7 @@ __export(module_exports, {
   mongoLockModuleConfig: () => mongoLockModuleConfig
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/injector.js");
 var import_lock = require("../lock.js");
 var import_provider = require("../provider.js");
 var import_lock2 = require("./lock.js");
@@ -33,7 +33,7 @@ const mongoLockModuleConfig = {
 function configureMongoLock(lockRepositoryConfig, register = true) {
   mongoLockModuleConfig.lockEntityRepositoryConfig = lockRepositoryConfig;
   if (register) {
-    import_container.container.registerSingleton(import_provider.LockProvider, { useToken: import_provider2.MongoLockProvider });
-    import_container.container.register(import_lock.Lock, { useToken: import_lock2.MongoLock });
+    import_injector.Injector.registerSingleton(import_provider.LockProvider, { useToken: import_provider2.MongoLockProvider });
+    import_injector.Injector.register(import_lock.Lock, { useToken: import_lock2.MongoLock });
   }
 }

package/lock/mongo/mongo-lock-repository.d.ts

@@ -1,10 +1,10 @@
-import type { Injectable } from '../../container/index.js';
-import { type resolveArgumentType } from '../../container/index.js';
 import type { CollectionArgument } from '../../database/mongo/index.js';
 import { Collection, MongoEntityRepository } from '../../database/mongo/index.js';
+import { resolveArgumentType } from '../../injector/index.js';
+import type { Resolvable } from '../../injector/interfaces.js';
 import { Logger } from '../../logger/index.js';
 import type { MongoLockEntity } from './model.js';
-export declare class MongoLockRepository extends MongoEntityRepository<MongoLockEntity> implements Injectable<CollectionArgument<MongoLockEntity>> {
+export declare class MongoLockRepository extends MongoEntityRepository<MongoLockEntity> implements Resolvable<CollectionArgument<MongoLockEntity>> {
     readonly [resolveArgumentType]: CollectionArgument<MongoLockEntity>;
     constructor(collection: Collection<MongoLockEntity>, logger: Logger);
     tryInsertOrRefresh(resource: string, key: string, newExpirationDate: Date): Promise<false | Date>;

package/lock/mongo/mongo-lock-repository.js

@@ -21,9 +21,9 @@ __export(mongo_lock_repository_exports, {
   MongoLockRepository: () => MongoLockRepository
 });
 module.exports = __toCommonJS(mongo_lock_repository_exports);
-var import_container = require("../../container/index.js");
 var import_database = require("../../database/index.js");
 var import_mongo = require("../../database/mongo/index.js");
+var import_injector = require("../../injector/index.js");
 var import_logger = require("../../logger/index.js");
 var import_date_time = require("../../utils/date-time.js");
 var import_mongodb = require("mongodb");
@@ -89,7 +89,7 @@ let MongoLockRepository = class MongoLockRepository2 extends import_mongo.MongoE
   }
 };
 MongoLockRepository = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.forwardArg)()),
+  (0, import_injector.Singleton)(),
+  __param(0, (0, import_injector.ForwardArg)()),
   __metadata("design:paramtypes", [import_mongo.Collection, import_logger.Logger])
 ], MongoLockRepository);

package/lock/mongo/provider.js

@@ -21,7 +21,7 @@ __export(provider_exports, {
   MongoLockProvider: () => MongoLockProvider
 });
 module.exports = __toCommonJS(provider_exports);
-var import_container = require("../../container/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_type_guards = require("../../utils/type-guards.js");
@@ -67,9 +67,9 @@ let MongoLockProvider = MongoLockProvider_1 = class MongoLockProvider2 extends i
   }
 };
 MongoLockProvider = MongoLockProvider_1 = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.resolveArgProvider)(collectionArgumentProvider)),
-  __param(1, (0, import_container.resolveArg)("MongoLock")),
-  __param(2, (0, import_container.injectArg)()),
+  (0, import_decorators.Singleton)(),
+  __param(0, (0, import_decorators.ResolveArgProvider)(collectionArgumentProvider)),
+  __param(1, (0, import_decorators.ResolveArg)("MongoLock")),
+  __param(2, (0, import_decorators.InjectArg)()),
   __metadata("design:paramtypes", [import_mongo_lock_repository.MongoLockRepository, import_logger.Logger, String])
 ], MongoLockProvider);

package/lock/provider.d.ts

@@ -1,8 +1,9 @@
-import type { Injectable, resolveArgumentType } from '../container/index.js';
+import type { Resolvable } from '../injector/index.js';
+import { resolveArgumentType } from '../injector/index.js';
 import type { Lock } from './lock.js';
 /** prefix */
 export type LockProviderArgument = string;
-export declare abstract class LockProvider implements Injectable<LockProviderArgument> {
+export declare abstract class LockProvider implements Resolvable<LockProviderArgument> {
     readonly [resolveArgumentType]: LockProviderArgument;
     abstract prefix(prefix: string): LockProvider;
     abstract get(resource: string): Lock;

package/lock/provider.js

@@ -21,5 +21,6 @@ __export(provider_exports, {
   LockProvider: () => LockProvider
 });
 module.exports = __toCommonJS(provider_exports);
+var import_injector = require("../injector/index.js");
 class LockProvider {
 }

package/lock/web/module.js

@@ -21,12 +21,12 @@ __export(module_exports, {
   configureWebLock: () => configureWebLock
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/injector.js");
 var import_lock = require("../lock.js");
 var import_provider = require("../provider.js");
 var import_web_lock = require("./web-lock.js");
 var import_web_lock_provider = require("./web-lock.provider.js");
 function configureWebLock() {
-  import_container.container.registerSingleton(import_provider.LockProvider, { useToken: import_web_lock_provider.WebLockProvider });
-  import_container.container.register(import_lock.Lock, { useToken: import_web_lock.WebLock });
+  import_injector.Injector.registerSingleton(import_provider.LockProvider, { useToken: import_web_lock_provider.WebLockProvider });
+  import_injector.Injector.register(import_lock.Lock, { useToken: import_web_lock.WebLock });
 }

package/lock/web/web-lock.js

@@ -21,7 +21,7 @@ __export(web_lock_exports, {
   WebLock: () => WebLock
 });
 module.exports = __toCommonJS(web_lock_exports);
-var import_container = require("../../container/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");
@@ -98,7 +98,7 @@ let WebLock = class WebLock2 extends import_lock.Lock {
   }
 };
 WebLock = __decorate([
-  (0, import_container.injectable)({
+  (0, import_injector.Injectable)({
     provider: {
       useFactory: (argument, context) => {
         const arg = argument;

package/lock/web/web-lock.provider.js

@@ -21,7 +21,7 @@ __export(web_lock_provider_exports, {
   WebLockProvider: () => WebLockProvider
 });
 module.exports = __toCommonJS(web_lock_provider_exports);
-var import_container = require("../../container/index.js");
+var import_injector = require("../../injector/index.js");
 var import_lock = require("../../lock/index.js");
 var import_web_lock = require("./web-lock.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -58,7 +58,7 @@ let WebLockProvider = WebLockProvider_1 = class WebLockProvider2 extends import_
   }
 };
 WebLockProvider = WebLockProvider_1 = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.injectArg)()),
+  (0, import_injector.Singleton)(),
+  __param(0, (0, import_injector.InjectArg)()),
   __metadata("design:paramtypes", [String])
 ], WebLockProvider);

package/logger/console/logger.js

@@ -21,7 +21,7 @@ __export(logger_exports, {
   ConsoleLogger: () => ConsoleLogger
 });
 module.exports = __toCommonJS(logger_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_format_error = require("../../utils/format-error.js");
 var import_type_guards = require("../../utils/type-guards.js");
@@ -75,7 +75,7 @@ let ConsoleLogger = ConsoleLogger_1 = class ConsoleLogger2 extends import_logger
   }
 };
 ConsoleLogger = ConsoleLogger_1 = __decorate([
-  (0, import_container.singleton)({
+  (0, import_decorators.Singleton)({
     provider: {
       useFactory: (argument, context) => {
         if ((0, import_type_guards.isObject)(argument)) {

package/logger/logger.d.ts

@@ -1,4 +1,5 @@
-import type { Injectable, resolveArgumentType } from '../container/index.js';
+import type { Resolvable } from '../injector/index.js';
+import { resolveArgumentType } from '../injector/index.js';
 import { LogLevel } from './level.js';
 export type LogEntry = string;
 export type LogEntryProvider = () => LogEntry;
@@ -19,7 +20,7 @@ export type LoggerForkOptions = {
     prefix?: string;
     level?: LogLevel;
 };
-export declare abstract class Logger implements Injectable<LoggerArgument> {
+export declare abstract class Logger implements Resolvable<LoggerArgument> {
     readonly level: LogLevel;
     readonly module?: string[];
     readonly logPrefix: string;

package/logger/logger.js

@@ -21,6 +21,7 @@ __export(logger_exports, {
   Logger: () => Logger
 });
 module.exports = __toCommonJS(logger_exports);
+var import_injector = require("../injector/index.js");
 var import_array = require("../utils/array/array.js");
 var import_type_guards = require("../utils/type-guards.js");
 var import_level = require("./level.js");

package/mail/clients/nodemailer.mail-client.js

@@ -22,9 +22,10 @@ __export(nodemailer_mail_client_exports, {
   configureNodemailerMailClient: () => configureNodemailerMailClient
 });
 module.exports = __toCommonJS(nodemailer_mail_client_exports);
-var import_container = require("../../container/index.js");
-var import_type_guards = require("../../utils/type-guards.js");
 var import_nodemailer = require("nodemailer");
+var import_injector = require("../../injector/index.js");
+var import_injector2 = require("../../injector/injector.js");
+var import_type_guards = require("../../utils/type-guards.js");
 var import_mail_client = require("../mail.client.js");
 var __decorate = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -76,8 +77,8 @@ let NodemailerMailClient = class NodemailerMailClient2 extends import_mail_clien
   }
 };
 NodemailerMailClient = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.injectArg)()),
+  (0, import_injector.Singleton)(),
+  __param(0, (0, import_injector.InjectArg)()),
   __metadata("design:paramtypes", [import_mail_client.MailClientConfig])
 ], NodemailerMailClient);
 function convertConfig(config) {
@@ -94,6 +95,6 @@ function convertConfig(config) {
 }
 function configureNodemailerMailClient(register = true) {
   if (register) {
-    import_container.container.registerSingleton(NodemailerMailClient, { useToken: import_mail_client.MailClient });
+    import_injector2.Injector.registerSingleton(NodemailerMailClient, { useToken: import_mail_client.MailClient });
   }
 }

package/mail/mail.client.d.ts

@@ -1,4 +1,5 @@
-import type { Injectable, resolveArgumentType } from '../container/index.js';
+import type { Resolvable } from '../injector/index.js';
+import { resolveArgumentType } from '../injector/index.js';
 import type { MailData, MailSendResult } from './models/index.js';
 export declare class MailClientAuthConfig {
     user: string;
@@ -10,7 +11,7 @@ export declare class MailClientConfig {
     secure?: boolean;
     auth?: MailClientAuthConfig;
 }
-export declare abstract class MailClient implements Injectable<MailClientConfig> {
+export declare abstract class MailClient implements Resolvable<MailClientConfig> {
     readonly [resolveArgumentType]: MailClientConfig;
     abstract send(data: MailData): Promise<MailSendResult>;
 }

package/mail/mail.client.js

@@ -23,6 +23,7 @@ __export(mail_client_exports, {
   MailClientConfig: () => MailClientConfig
 });
 module.exports = __toCommonJS(mail_client_exports);
+var import_injector = require("../injector/index.js");
 var import_property = require("../schema/decorators/property.js");
 var import_boolean = require("../schema/schemas/boolean.js");
 var import_optional = require("../schema/schemas/optional.js");

package/mail/mail.service.js

@@ -21,7 +21,7 @@ __export(mail_service_exports, {
   MailService: () => MailService
 });
 module.exports = __toCommonJS(mail_service_exports);
-var import_container = require("../container/index.js");
+var import_injector = require("../injector/index.js");
 var import_logger = require("../logger/index.js");
 var import_template_service = require("../templates/template.service.js");
 var import_date_time = require("../utils/date-time.js");
@@ -99,12 +99,12 @@ let MailService = class MailService2 {
   }
 };
 MailService = __decorate([
-  (0, import_container.singleton)(),
-  __param(2, (0, import_container.inject)(import_mail_log_repository.MailLogRepository)),
-  __param(2, (0, import_container.optional)()),
-  __param(3, (0, import_container.resolveArg)("MailService")),
-  __param(4, (0, import_container.inject)(import_tokens.MAIL_DEFAULT_DATA)),
-  __param(4, (0, import_container.optional)()),
+  (0, import_injector.Singleton)(),
+  __param(2, (0, import_injector.Inject)(import_mail_log_repository.MailLogRepository)),
+  __param(2, (0, import_injector.Optional)()),
+  __param(3, (0, import_injector.ResolveArg)("MailService")),
+  __param(4, (0, import_injector.Inject)(import_tokens.MAIL_DEFAULT_DATA)),
+  __param(4, (0, import_injector.Optional)()),
   __metadata("design:paramtypes", [
     import_mail_client.MailClient,
     import_template_service.TemplateService,

package/mail/module.js

@@ -21,22 +21,22 @@ __export(module_exports, {
   configureMail: () => configureMail
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../container/index.js");
+var import_injector = require("../injector/injector.js");
 var import_type_guards = require("../utils/type-guards.js");
 var import_mail_log_repository = require("./mail-log.repository.js");
 var import_mail_client = require("./mail.client.js");
 var import_tokens = require("./tokens.js");
 function configureMail({ clientConfig, client, logRepository, defaultData }) {
   if ((0, import_type_guards.isDefined)(clientConfig)) {
-    import_container.container.registerSingleton(import_mail_client.MailClientConfig, { useValue: clientConfig });
+    import_injector.Injector.registerSingleton(import_mail_client.MailClientConfig, { useValue: clientConfig });
   }
   if ((0, import_type_guards.isDefined)(client)) {
-    import_container.container.registerSingleton(import_mail_client.MailClient, { useToken: client });
+    import_injector.Injector.registerSingleton(import_mail_client.MailClient, { useToken: client });
   }
   if ((0, import_type_guards.isDefined)(logRepository)) {
-    import_container.container.registerSingleton(import_mail_log_repository.MailLogRepository, { useToken: logRepository });
+    import_injector.Injector.registerSingleton(import_mail_log_repository.MailLogRepository, { useToken: logRepository });
   }
   if ((0, import_type_guards.isDefined)(defaultData)) {
-    import_container.container.registerSingleton(import_tokens.MAIL_DEFAULT_DATA, { useValue: defaultData });
+    import_injector.Injector.registerSingleton(import_tokens.MAIL_DEFAULT_DATA, { useValue: defaultData });
   }
 }

package/mail/repositories/mongo-mail-log.repository.d.ts

@@ -1,7 +1,7 @@
-import type { Injectable } from '../../container/index.js';
-import { type resolveArgumentType } from '../../container/index.js';
 import type { CollectionArgument } from '../../database/mongo/index.js';
 import { Collection, MongoEntityRepository } from '../../database/mongo/index.js';
+import { resolveArgumentType } from '../../injector/index.js';
+import type { Resolvable } from '../../injector/interfaces.js';
 import { Logger } from '../../logger/index.js';
 import type { MailLog } from '../models/mail-log.model.js';
 export type MongoMailLogRepositoryConfig = {
@@ -9,7 +9,7 @@ export type MongoMailLogRepositoryConfig = {
 };
 export type MongoMailLogRepositoryArgument = CollectionArgument<MailLog>;
 export declare const mongoMailLogRepositoryConfig: MongoMailLogRepositoryConfig;
-export declare class MongoMailLogRepository extends MongoEntityRepository<MailLog> implements Injectable<MongoMailLogRepositoryArgument> {
+export declare class MongoMailLogRepository extends MongoEntityRepository<MailLog> implements Resolvable<MongoMailLogRepositoryArgument> {
     readonly [resolveArgumentType]: MongoMailLogRepositoryArgument;
     constructor(collection: Collection<MailLog>, logger: Logger);
 }

package/mail/repositories/mongo-mail-log.repository.js

@@ -23,8 +23,8 @@ __export(mongo_mail_log_repository_exports, {
   mongoMailLogRepositoryConfig: () => mongoMailLogRepositoryConfig
 });
 module.exports = __toCommonJS(mongo_mail_log_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_logger = require("../../logger/index.js");
 var __decorate = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -53,10 +53,10 @@ let MongoMailLogRepository = class MongoMailLogRepository2 extends import_mongo.
   }
 };
 MongoMailLogRepository = __decorate([
-  (0, import_container.singleton)({
+  (0, import_injector.Singleton)({
     defaultArgumentProvider: () => mongoMailLogRepositoryConfig.config
   }),
-  __param(0, (0, import_container.forwardArg)()),
+  __param(0, (0, import_injector.ForwardArg)()),
   __metadata("design:paramtypes", [import_mongo.Collection, import_logger.Logger])
 ], MongoMailLogRepository);
 function configureMongoMailLogRepository(config = {}) {

package/mail/tokens.d.ts

@@ -1 +1 @@
-export declare const MAIL_DEFAULT_DATA: import("../container/index.js").InjectionToken<Partial<import("./models/mail-data.model.js").MailData>, any>;
+export declare const MAIL_DEFAULT_DATA: import("../injector/index.js").InjectionToken<Partial<import("./models/mail-data.model.js").MailData>, never>;

package/mail/tokens.js

@@ -21,5 +21,5 @@ __export(tokens_exports, {
   MAIL_DEFAULT_DATA: () => MAIL_DEFAULT_DATA
 });
 module.exports = __toCommonJS(tokens_exports);
-var import_container = require("../container/index.js");
-const MAIL_DEFAULT_DATA = (0, import_container.injectionToken)("DefaultMailData");
+var import_injector = require("../injector/index.js");
+const MAIL_DEFAULT_DATA = (0, import_injector.injectionToken)("DefaultMailData");