@tstdl/base 0.85.26 → 0.86.0-beta10

package/openid-connect/oidc.service.js

@@ -21,11 +21,11 @@ __export(oidc_service_exports, {
   OidcService: () => OidcService
 });
 module.exports = __toCommonJS(oidc_service_exports);
-var import_container = require("../container/index.js");
 var import_forbidden_error = require("../error/forbidden.error.js");
 var import_not_implemented_error = require("../error/not-implemented.error.js");
 var import_client = require("../http/client/index.js");
 var import_http_headers = require("../http/http-headers.js");
+var import_injector = require("../injector/index.js");
 var import_schema = require("../schema/index.js");
 var import_alphabet = require("../utils/alphabet.js");
 var import_cryptography = require("../utils/cryptography.js");
@@ -185,9 +185,9 @@ let OidcService = class OidcService2 {
   }
 };
 OidcService = __decorate([
-  (0, import_container.singleton)(),
-  __param(1, (0, import_container.inject)(import_oidc_state_repository.OidcStateRepository)),
-  __param(1, (0, import_container.optional)()),
+  (0, import_injector.Singleton)(),
+  __param(1, (0, import_injector.Inject)(import_oidc_state_repository.OidcStateRepository)),
+  __param(1, (0, import_injector.Optional)()),
   __metadata("design:paramtypes", [import_oidc_configuration_service.OidcConfigurationService, Object, import_client.HttpClient])
 ], OidcService);
 function parseTokenResponse(response) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.85.26",
+  "version": "0.86.0-beta10",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"

package/pdf/pdf.service.d.ts

@@ -2,8 +2,8 @@ import { BrowserContextController } from '../browser/browser-context-controller.
 import type { BrowserControllerArgument } from '../browser/browser-controller.js';
 import { BrowserController } from '../browser/browser-controller.js';
 import { PdfRenderOptions } from '../browser/pdf-options.js';
-import type { Injectable } from '../container/index.js';
-import { resolveArgumentType } from '../container/index.js';
+import type { Resolvable } from '../injector/index.js';
+import { resolveArgumentType } from '../injector/index.js';
 import { LogLevel } from '../logger/level.js';
 import { Logger } from '../logger/logger.js';
 import type { TemplateField } from '../templates/index.js';
@@ -39,7 +39,7 @@ export type PdfServiceOptions = {
 export type PdfServiceArgument = PdfServiceOptions & {
     browserControllerArgument: BrowserControllerArgument;
 };
-export declare class PdfService implements Injectable<PdfServiceArgument> {
+export declare class PdfService implements Resolvable<PdfServiceArgument> {
     private readonly templateService;
     private readonly browserController;
     private readonly logger;

package/pdf/pdf.service.js

@@ -27,7 +27,7 @@ module.exports = __toCommonJS(pdf_service_exports);
 var import_browser_context_controller = require("../browser/browser-context-controller.js");
 var import_browser_controller = require("../browser/browser-controller.js");
 var import_pdf_options = require("../browser/pdf-options.js");
-var import_container = require("../container/index.js");
+var import_injector = require("../injector/index.js");
 var import_level = require("../logger/level.js");
 var import_logger = require("../logger/logger.js");
 var import_schema = require("../schema/index.js");
@@ -207,10 +207,10 @@ let PdfService = class PdfService2 {
   }
 };
 PdfService = __decorate([
-  (0, import_container.singleton)(),
-  __param(1, (0, import_container.forwardArg)((argument) => argument?.browserControllerArgument ?? { browserArguments })),
-  __param(2, (0, import_container.resolveArg)("PdfService")),
-  __param(3, (0, import_container.injectArg)()),
+  (0, import_injector.Singleton)(),
+  __param(1, (0, import_injector.ForwardArg)((argument) => argument?.browserControllerArgument ?? { browserArguments })),
+  __param(2, (0, import_injector.ResolveArg)("PdfService")),
+  __param(3, (0, import_injector.InjectArg)()),
   __metadata("design:paramtypes", [
     import_templates.TemplateService,
     import_browser_controller.BrowserController,

package/process-shutdown.d.ts

@@ -2,6 +2,6 @@ import type { Logger } from './logger/index.js';
 import { CancellationToken } from './utils/cancellation-token.js';
 export declare const shutdownToken: CancellationToken;
 export declare function setProcessShutdownLogger(shutdownLogger: Logger): void;
-export declare function requestShutdown(): void;
-export declare function forceShutdown(): void;
+export declare function requestShutdown(exitCode?: number): void;
+export declare function forceShutdown(exitCode?: number): void;
 export declare function initializeSignals(): void;

package/process-shutdown.js

@@ -27,17 +27,15 @@ __export(process_shutdown_exports, {
 module.exports = __toCommonJS(process_shutdown_exports);
 var import_cancellation_token = require("./utils/cancellation-token.js");
 var import_type_guards = require("./utils/type-guards.js");
-var import_container = require("./container/container.js");
-var import_core = require("./core.js");
 const quitSignals = ["SIGTERM", "SIGINT", "SIGHUP", "SIGBREAK"];
 const quitEvents = ["uncaughtException", "unhandledRejection", "rejectionHandled"];
 const shutdownToken = new import_cancellation_token.CancellationToken();
-let logger = import_container.container.resolve(import_core.CORE_LOGGER);
+let logger;
 function setProcessShutdownLogger(shutdownLogger) {
   logger = shutdownLogger;
 }
 let shutdownRequested = false;
-function requestShutdown() {
+function requestShutdown(exitCode = 1) {
   if (shutdownRequested) {
     return;
   }
@@ -45,17 +43,17 @@ function requestShutdown() {
   shutdownToken.set();
   const timeout = setTimeout(() => {
     logger.warn("forcefully quitting after 20 seconds...");
-    setTimeout(() => process.exit(1), 1);
+    setTimeout(() => process.exit(exitCode), 1);
   }, 2e4);
   timeout.unref();
 }
-function forceShutdown() {
+function forceShutdown(exitCode = 1) {
   logger.warn("forcefully quitting");
-  setTimeout(() => process.exit(2), 1);
+  setTimeout(() => process.exit(exitCode), 1);
 }
 let signalsInitialized = false;
 function initializeSignals() {
-  if (signalsInitialized) {
+  if (signalsInitialized || typeof process == "undefined") {
     return;
   }
   signalsInitialized = true;

package/queue/mongo/mongo-job.repository.d.ts

@@ -1,11 +1,11 @@
-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 type { Resolvable } from '../../injector/index.js';
+import { resolveArgumentType } from '../../injector/index.js';
 import { Logger } from '../../logger/index.js';
 import { UniqueTagStrategy } from '../../queue/index.js';
 import type { MongoJob, NewMongoJob } from './job.js';
-export declare class MongoJobRepository<T> extends MongoEntityRepository<MongoJob<T>> implements Injectable<CollectionArgument<MongoJob<T>>> {
+export declare class MongoJobRepository<T> extends MongoEntityRepository<MongoJob<T>> implements Resolvable<CollectionArgument<MongoJob<T>>> {
     readonly [resolveArgumentType]: CollectionArgument<MongoJob<T>>;
     constructor(collection: Collection<MongoJob<T>>, logger: Logger);
     insertWithUniqueTagStrategy(newJob: NewMongoJob<T>, uniqueTagStrategy: UniqueTagStrategy): Promise<MongoJob<T>>;

package/queue/mongo/mongo-job.repository.js

@@ -21,9 +21,9 @@ __export(mongo_job_repository_exports, {
   MongoJobRepository: () => MongoJobRepository
 });
 module.exports = __toCommonJS(mongo_job_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_queue = require("../../queue/index.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -73,8 +73,8 @@ let MongoJobRepository = MongoJobRepository_1 = class MongoJobRepository2 extend
   }
 };
 MongoJobRepository = MongoJobRepository_1 = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.forwardArg)()),
-  __param(1, (0, import_container.resolveArg)(MongoJobRepository_1.name)),
+  (0, import_injector.Singleton)(),
+  __param(0, (0, import_injector.ForwardArg)()),
+  __param(1, (0, import_injector.ResolveArg)(MongoJobRepository_1.name)),
   __metadata("design:paramtypes", [import_mongo.Collection, import_logger.Logger])
 ], MongoJobRepository);

package/queue/mongo/queue.js

@@ -21,8 +21,8 @@ __export(queue_exports, {
   MongoQueue: () => MongoQueue
 });
 module.exports = __toCommonJS(queue_exports);
-var import_container = require("../../container/index.js");
 var import_id = require("../../database/id.js");
+var import_decorators = require("../../injector/decorators.js");
 var import_lock = require("../../lock/index.js");
 var import_message_bus = require("../../message-bus/index.js");
 var import_queue = require("../../queue/index.js");
@@ -241,10 +241,10 @@ let MongoQueue = class MongoQueue2 extends import_queue.Queue {
   }
 };
 MongoQueue = __decorate([
-  (0, import_container.singleton)({
+  (0, import_decorators.Singleton)({
     provider: {
-      useFactory: async (argument, context) => {
-        const provider = await context.resolveAsync(import_queue_provider.MongoQueueProvider);
+      useFactory: (argument, context) => {
+        const provider = context.resolve(import_queue_provider.MongoQueueProvider);
         (0, import_type_guards.assertDefined)(argument, "queue resolve argument is missing");
         if ((0, import_type_guards.isString)(argument)) {
           return provider.get(argument, import_queue.defaultQueueConfig);

package/queue/mongo/queue.provider.d.ts

@@ -1,6 +1,6 @@
-import type { Injectable } from '../../container/index.js';
-import { resolveArgumentType } from '../../container/index.js';
 import type { CollectionArgument, MongoRepositoryConfig } from '../../database/mongo/index.js';
+import type { Resolvable } from '../../injector/interfaces.js';
+import { resolveArgumentType } from '../../injector/interfaces.js';
 import { LockProvider } from '../../lock/index.js';
 import { MessageBusProvider } from '../../message-bus/index.js';
 import type { QueueConfig } from '../../queue/index.js';
@@ -8,7 +8,7 @@ import { QueueProvider } from '../../queue/index.js';
 import type { MongoJob } from './job.js';
 import { MongoJobRepository } from './mongo-job.repository.js';
 import { MongoQueue } from './queue.js';
-export declare class MongoQueueProvider extends QueueProvider implements Injectable<CollectionArgument<MongoJob>> {
+export declare class MongoQueueProvider extends QueueProvider implements Resolvable<CollectionArgument<MongoJob>> {
     private readonly repository;
     private readonly lockProvider;
     private readonly messageBusProvider;

package/queue/mongo/queue.provider.js

@@ -22,7 +22,9 @@ __export(queue_provider_exports, {
   configureMongoQueue: () => configureMongoQueue
 });
 module.exports = __toCommonJS(queue_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_interfaces = require("../../injector/interfaces.js");
 var import_lock = require("../../lock/index.js");
 var import_message_bus = require("../../message-bus/index.js");
 var import_queue = require("../../queue/index.js");
@@ -64,15 +66,15 @@ let MongoQueueProvider = class MongoQueueProvider2 extends import_queue.QueuePro
   }
 };
 MongoQueueProvider = __decorate([
-  (0, import_container.singleton)({ defaultArgumentProvider: () => defaultJobRepositoryConfig }),
-  __param(0, (0, import_container.forwardArg)()),
-  __param(1, (0, import_container.resolveArg)("queue:")),
+  (0, import_decorators.Singleton)({ defaultArgumentProvider: () => defaultJobRepositoryConfig }),
+  __param(0, (0, import_decorators.ForwardArg)()),
+  __param(1, (0, import_decorators.ResolveArg)("queue:")),
   __metadata("design:paramtypes", [import_mongo_job_repository.MongoJobRepository, import_lock.LockProvider, import_message_bus.MessageBusProvider])
 ], MongoQueueProvider);
 function configureMongoQueue(jobRepositoryConfig, register = true) {
   defaultJobRepositoryConfig = jobRepositoryConfig;
   if (register) {
-    import_container.container.registerSingleton(import_queue.QueueProvider, { useToken: MongoQueueProvider });
-    import_container.container.registerSingleton(import_queue.Queue, { useToken: import_queue2.MongoQueue });
+    import_injector.Injector.registerSingleton(import_queue.QueueProvider, { useToken: MongoQueueProvider });
+    import_injector.Injector.registerSingleton(import_queue.Queue, { useToken: import_queue2.MongoQueue });
   }
 }

package/queue/queue.d.ts

@@ -1,5 +1,5 @@
-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 { ReadonlyCancellationToken } from '../utils/cancellation-token.js';
 import { QueueEnqueueBatch } from './enqueue-batch.js';
 export type JobTag = string | number | null;
@@ -34,7 +34,7 @@ export type QueueArgument = string | (QueueConfig & {
     key: string;
 });
 export declare const defaultQueueConfig: Required<QueueConfig>;
-export declare abstract class Queue<T> implements Injectable<QueueArgument> {
+export declare abstract class Queue<T> implements Resolvable<QueueArgument> {
     readonly [resolveArgumentType]: QueueArgument;
     batch(): QueueEnqueueBatch<T>;
     abstract enqueue(data: T, options?: EnqueueOptions): Promise<Job<T>>;

package/queue/queue.js

@@ -24,7 +24,7 @@ __export(queue_exports, {
   defaultQueueConfig: () => defaultQueueConfig
 });
 module.exports = __toCommonJS(queue_exports);
-var import_container = require("../container/index.js");
+var import_interfaces = require("../injector/interfaces.js");
 var import_units = require("../utils/units.js");
 var import_enqueue_batch = require("./enqueue-batch.js");
 const defaultJobPriority = 1e3;

package/search-index/elastic/config.d.ts

@@ -1,8 +1,8 @@
-import type { Injectable } from '../../container/index.js';
-import { type resolveArgumentType } from '../../container/index.js';
 import type { Entity } from '../../database/index.js';
+import { resolveArgumentType } from '../../injector/interfaces.js';
+import type { Resolvable } from '../../injector/interfaces.js';
 export type ElasticSearchIndexConfigArgument<T extends Entity = Entity> = string | ElasticSearchIndexConfig<T>;
-export declare abstract class ElasticSearchIndexConfig<T extends Entity = Entity> implements Injectable<ElasticSearchIndexConfigArgument> {
+export declare abstract class ElasticSearchIndexConfig<T extends Entity = Entity> implements Resolvable<ElasticSearchIndexConfigArgument> {
     readonly indexName: string;
     readonly [resolveArgumentType]: ElasticSearchIndexConfigArgument<T>;
     constructor(indexNameOrConfig: string | ElasticSearchIndexConfig<T>);

package/search-index/elastic/config.js

@@ -21,7 +21,8 @@ __export(config_exports, {
   ElasticSearchIndexConfig: () => ElasticSearchIndexConfig
 });
 module.exports = __toCommonJS(config_exports);
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
+var import_interfaces = require("../../injector/interfaces.js");
 var import_type_guards = require("../../utils/type-guards.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;
@@ -49,7 +50,7 @@ let ElasticSearchIndexConfig = class ElasticSearchIndexConfig2 {
   }
 };
 ElasticSearchIndexConfig = __decorate([
-  (0, import_container.injectable)(),
-  __param(0, (0, import_container.injectArg)()),
+  (0, import_decorators.Injectable)(),
+  __param(0, (0, import_decorators.InjectArg)()),
   __metadata("design:paramtypes", [Object])
 ], ElasticSearchIndexConfig);

package/search-index/elastic/module.d.ts

@@ -1,4 +1,3 @@
-import type { Entity } from '../../database/index.js';
 import type { ClientOptions } from '@elastic/elasticsearch';
 import type { ElasticSearchIndexConfigArgument } from './config.js';
 import { ElasticSearchIndexConfig } from './config.js';
@@ -7,6 +6,5 @@ export type ElasticsearchModuleConfig = {
     logPrefix: string;
 };
 export declare const elasticsearchModuleConfig: ElasticsearchModuleConfig;
-export declare const ELASTIC_SEARCH_INDEX_CONFIG: import("../../container/index.js").InjectionToken<ElasticSearchIndexConfig<Entity>, ElasticSearchIndexConfigArgument>;
+export declare const ELASTIC_SEARCH_INDEX_CONFIG: import("../../injector/token.js").InjectionToken<ElasticSearchIndexConfig<import("../../database/entity.js").Entity>, ElasticSearchIndexConfigArgument>;
 export declare function configureElasticsearch(config?: Partial<ElasticsearchModuleConfig>): void;
-export declare function getElasticSearchIndexConfig<T extends Entity>(indexName: string): ElasticSearchIndexConfig<T>;

package/search-index/elastic/module.js

@@ -20,13 +20,14 @@ var module_exports = {};
 __export(module_exports, {
   ELASTIC_SEARCH_INDEX_CONFIG: () => ELASTIC_SEARCH_INDEX_CONFIG,
   configureElasticsearch: () => configureElasticsearch,
-  elasticsearchModuleConfig: () => elasticsearchModuleConfig,
-  getElasticSearchIndexConfig: () => getElasticSearchIndexConfig
+  elasticsearchModuleConfig: () => elasticsearchModuleConfig
 });
 module.exports = __toCommonJS(module_exports);
-var import_container = require("../../container/index.js");
 var import_core = require("../../core.js");
-var import_logger = require("../../logger/index.js");
+var import_inject = require("../../injector/inject.js");
+var import_injector = require("../../injector/injector.js");
+var import_token = require("../../injector/token.js");
+var import_logger = require("../../logger/logger.js");
 var import_type_guards = require("../../utils/type-guards.js");
 var import_elasticsearch = require("@elastic/elasticsearch");
 var import_config = require("./config.js");
@@ -34,28 +35,30 @@ const elasticsearchModuleConfig = {
   defaultOptions: { node: "http://localhost:9200" },
   logPrefix: "ELASTIC"
 };
-const ELASTIC_SEARCH_INDEX_CONFIG = (0, import_container.injectionToken)("ElasticSearchIndexConfig");
+const ELASTIC_SEARCH_INDEX_CONFIG = (0, import_token.injectionToken)("ElasticSearchIndexConfig");
 function configureElasticsearch(config = {}) {
   elasticsearchModuleConfig.defaultOptions = config.defaultOptions ?? elasticsearchModuleConfig.defaultOptions;
   elasticsearchModuleConfig.logPrefix = config.logPrefix ?? elasticsearchModuleConfig.logPrefix;
 }
-import_container.container.registerSingleton(import_elasticsearch.Client, {
-  useFactory: async (options) => {
-    (0, import_type_guards.assertDefined)(options, "missing elasticsearch client options");
-    const logger = await import_container.container.resolveAsync(import_logger.Logger, elasticsearchModuleConfig.logPrefix);
-    const client = new import_elasticsearch.Client(options);
-    import_core.disposer.add(async () => client.close().then(() => logger.info("closed connection")));
-    const url = getUrl(options.node ?? options.nodes);
-    await (0, import_core.connect)(`elasticsearch (${url})`, async () => client.ping().then((alive) => (0, import_type_guards.assert)(alive, "failed to connect")), logger);
+import_injector.Injector.registerSingleton(import_elasticsearch.Client, {
+  useFactory: (argument, context) => {
+    (0, import_type_guards.assertDefined)(argument, "missing elasticsearch client options");
+    context.context.logger = (0, import_inject.inject)(import_logger.Logger, elasticsearchModuleConfig.logPrefix);
+    const client = new import_elasticsearch.Client(argument);
+    context.addDisposeHandler(async () => client.close().then(() => context.context.logger.info("closed connection")));
     return client;
+  },
+  async afterResolve(client, options, context) {
+    const url = getUrl(options.node ?? options.nodes);
+    await (0, import_core.connect)(`elasticsearch (${url})`, async () => client.ping().then((alive) => (0, import_type_guards.assert)(alive, "failed to connect")), context.logger);
+  },
+  defaultArgumentProvider() {
+    return elasticsearchModuleConfig.defaultOptions;
   }
-}, { defaultArgumentProvider: () => elasticsearchModuleConfig.defaultOptions });
-import_container.container.registerSingleton(ELASTIC_SEARCH_INDEX_CONFIG, {
+});
+import_injector.Injector.registerSingleton(ELASTIC_SEARCH_INDEX_CONFIG, {
   useFactory: (argument, context) => context.resolve(import_config.ElasticSearchIndexConfig, argument)
 });
-function getElasticSearchIndexConfig(indexName) {
-  return import_container.container.resolve(import_config.ElasticSearchIndexConfig, indexName);
-}
 function getUrl(node) {
   if ((0, import_type_guards.isString)(node)) {
     return node;

package/search-index/elastic/search-index.d.ts

@@ -1,6 +1,6 @@
-import type { AfterResolve } from '../../container/index.js';
-import { afterResolve } from '../../container/index.js';
 import type { Entity, Query, QueryOptions } from '../../database/index.js';
+import type { AfterResolve } from '../../injector/interfaces.js';
+import { afterResolve } from '../../injector/interfaces.js';
 import type { Logger } from '../../logger/index.js';
 import type { SearchResult } from '../../search-index/index.js';
 import { SearchIndex } from '../../search-index/index.js';

package/search-index/elastic/search-index.js

@@ -21,9 +21,9 @@ __export(search_index_exports, {
   ElasticSearchIndex: () => ElasticSearchIndex
 });
 module.exports = __toCommonJS(search_index_exports);
-var import_container = require("../../container/index.js");
 var import_bad_request_error = require("../../error/bad-request.error.js");
 var import_multi_error = require("../../error/multi.error.js");
+var import_interfaces = require("../../injector/interfaces.js");
 var import_search_index = require("../../search-index/index.js");
 var import_base64 = require("../../utils/base64.js");
 var import_encoding = require("../../utils/encoding.js");
@@ -48,7 +48,7 @@ class ElasticSearchIndex extends import_search_index.SearchIndex {
     this.logger = logger;
     this.keywordRewriter = new import_keyword_rewriter.KeywordRewriter(keywordRewrites);
   }
-  async [import_container.afterResolve]() {
+  async [import_interfaces.afterResolve]() {
     await this.initialize();
   }
   async initialize() {

package/templates/module.d.ts

@@ -1,7 +1,7 @@
 import type { Type } from '../types.js';
 import { TemplateProvider } from './template.provider.js';
-import type { TemplateRenderer } from './template.renderer.js';
-import type { TemplateResolver } from './template.resolver.js';
+import { TemplateRenderer } from './template.renderer.js';
+import { TemplateResolver } from './template.resolver.js';
 export type TemplateModuleConfig = {
     templateProvider: Type<TemplateProvider> | undefined;
     templateResolvers: Type<TemplateResolver>[];

package/templates/module.js

@@ -22,43 +22,29 @@ __export(module_exports, {
   templateModuleConfig: () => templateModuleConfig
 });
 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_string_template_renderer = require("./renderers/string.template-renderer.js");
 var import_string_template_resolver = require("./resolvers/string.template-resolver.js");
 var import_template_provider = require("./template.provider.js");
+var import_template_renderer = require("./template.renderer.js");
+var import_template_resolver = require("./template.resolver.js");
 var import_tokens = require("./tokens.js");
 const templateModuleConfig = {
   templateProvider: void 0,
   templateResolvers: [import_string_template_resolver.StringTemplateResolver],
   templateRenderers: [import_string_template_renderer.StringTemplateRenderer]
 };
-import_container.container.registerSingleton(import_tokens.TEMPLATE_RESOLVERS, {
-  useFactory: (_, context) => {
-    if (context.isAsync) {
-      return (async () => {
-        const resolves = templateModuleConfig.templateResolvers.map(async (type) => context.resolveAsync(type));
-        return Promise.all(resolves);
-      })();
-    }
-    return templateModuleConfig.templateResolvers.map((type) => context.resolve(type));
-  }
-});
-import_container.container.registerSingleton(import_tokens.TEMPLATE_RENDERERS, {
-  useFactory: (_, context) => {
-    if (context.isAsync) {
-      return (async () => {
-        const resolves = templateModuleConfig.templateRenderers.map(async (type) => context.resolveAsync(type));
-        return Promise.all(resolves);
-      })();
-    }
-    return templateModuleConfig.templateRenderers.map((type) => context.resolve(type));
-  }
-});
+import_injector.Injector.registerSingleton(import_tokens.TEMPLATE_RESOLVERS, { useToken: import_template_resolver.TemplateResolver, resolveAll: true });
+import_injector.Injector.registerSingleton(import_tokens.TEMPLATE_RENDERERS, { useToken: import_template_renderer.TemplateRenderer, resolveAll: true });
 function configureTemplates(config = {}) {
   if ((0, import_type_guards.isDefined)(config.templateProvider)) {
-    import_container.container.registerSingleton(import_template_provider.TemplateProvider, { useToken: config.templateProvider });
+    import_injector.Injector.registerSingleton(import_template_provider.TemplateProvider, { useToken: config.templateProvider });
+  }
+  if ((0, import_type_guards.isDefined)(config.templateResolvers)) {
+    import_injector.Injector.register(import_template_resolver.TemplateResolver, config.templateResolvers.map((resolver) => ({ useToken: resolver })));
+  }
+  if ((0, import_type_guards.isDefined)(config.templateRenderers)) {
+    import_injector.Injector.register(import_template_renderer.TemplateRenderer, config.templateRenderers.map((renderer) => ({ useToken: renderer })));
   }
-  templateModuleConfig.templateResolvers = [.../* @__PURE__ */ new Set([...templateModuleConfig.templateResolvers, ...config.templateResolvers ?? []])];
-  templateModuleConfig.templateRenderers = [.../* @__PURE__ */ new Set([...templateModuleConfig.templateRenderers, ...config.templateRenderers ?? []])];
 }

package/templates/providers/file.template-provider.d.ts

@@ -1,5 +1,5 @@
-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 { Template } from '../template.model.js';
 import { TemplateProvider } from '../template.provider.js';
 export type FileTemplateProviderConfig = {
@@ -7,7 +7,7 @@ export type FileTemplateProviderConfig = {
 };
 export type FileTemplateProviderArgument = string;
 export declare const fileTemplateProviderConfig: FileTemplateProviderConfig;
-export declare class FileTemplateProvider extends TemplateProvider implements Injectable<FileTemplateProviderArgument> {
+export declare class FileTemplateProvider extends TemplateProvider implements Resolvable<FileTemplateProviderArgument> {
     private readonly basePath;
     readonly [resolveArgumentType]: FileTemplateProviderArgument;
     constructor(basePath: string);

package/templates/providers/file.template-provider.js

@@ -33,10 +33,11 @@ __export(file_template_provider_exports, {
   fileTemplateProviderConfig: () => fileTemplateProviderConfig
 });
 module.exports = __toCommonJS(file_template_provider_exports);
-var import_container = require("../../container/index.js");
+var path = __toESM(require("node:path"), 1);
 var import_bad_request_error = require("../../error/bad-request.error.js");
+var import_decorators = require("../../injector/decorators.js");
+var import_interfaces = require("../../injector/interfaces.js");
 var import_schema = require("../../schema/index.js");
-var path = __toESM(require("node:path"), 1);
 var import_template_model = require("../template.model.js");
 var import_template_provider = require("../template.provider.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -80,10 +81,10 @@ let FileTemplateProvider = class FileTemplateProvider2 extends import_template_p
   }
 };
 FileTemplateProvider = __decorate([
-  (0, import_container.singleton)({
+  (0, import_decorators.Singleton)({
     defaultArgumentProvider: () => fileTemplateProviderConfig.basePath
   }),
-  __param(0, (0, import_container.injectArg)()),
+  __param(0, (0, import_decorators.InjectArg)()),
   __metadata("design:paramtypes", [String])
 ], FileTemplateProvider);
 function configureFileTemplateProvider(config = {}) {

package/templates/providers/memory.template-provider.js

@@ -21,7 +21,7 @@ __export(memory_template_provider_exports, {
   MemoryTemplateProvider: () => MemoryTemplateProvider
 });
 module.exports = __toCommonJS(memory_template_provider_exports);
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
 var import_type_guards = require("../../utils/type-guards.js");
 var import_template_provider = require("../template.provider.js");
 var __decorate = function(decorators, target, key, desc) {
@@ -56,6 +56,6 @@ let MemoryTemplateProvider = class MemoryTemplateProvider2 extends import_templa
   }
 };
 MemoryTemplateProvider = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [])
 ], MemoryTemplateProvider);

package/templates/renderers/handlebars.template-renderer.js

@@ -31,7 +31,7 @@ __export(handlebars_template_renderer_exports, {
   HandlebarsTemplateRenderer: () => HandlebarsTemplateRenderer
 });
 module.exports = __toCommonJS(handlebars_template_renderer_exports);
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
 var import_memoize = require("../../utils/function/memoize.js");
 var import_object = require("../../utils/object/object.js");
 var import_type_guards = require("../../utils/type-guards.js");
@@ -90,7 +90,7 @@ let HandlebarsTemplateRenderer = class HandlebarsTemplateRenderer2 extends impor
   }
 };
 HandlebarsTemplateRenderer = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [import_template_resolver_provider.TemplateResolverProvider])
 ], HandlebarsTemplateRenderer);
 function _wrapHandlebarsTemplateHelper(helper) {

package/templates/renderers/jsx.template-renderer.js

@@ -22,7 +22,7 @@ __export(jsx_template_renderer_exports, {
 });
 module.exports = __toCommonJS(jsx_template_renderer_exports);
 var import_jsx_runtime = require("preact/jsx-runtime");
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
 var import_type_guards = require("../../utils/type-guards.js");
 var import_preact = require("preact");
 var import_preact_render_to_string = require("preact-render-to-string");
@@ -55,7 +55,7 @@ let JsxTemplateRenderer = class JsxTemplateRenderer2 extends import_template_ren
   }
 };
 JsxTemplateRenderer = __decorate([
-  (0, import_container.singleton)(),
+  (0, import_decorators.Singleton)(),
   __metadata("design:paramtypes", [])
 ], JsxTemplateRenderer);
 function isComponentClass(template) {

package/templates/renderers/mjml.template-renderer.js

@@ -31,7 +31,7 @@ __export(mjml_template_renderer_exports, {
   MjmlTemplateRenderer: () => MjmlTemplateRenderer
 });
 module.exports = __toCommonJS(mjml_template_renderer_exports);
-var import_container = require("../../container/index.js");
+var import_decorators = require("../../injector/decorators.js");
 var import_mjml = __toESM(require("mjml"), 1);
 var import_template_renderer_provider = require("../template-renderer.provider.js");
 var import_template_renderer = require("../template.renderer.js");
@@ -85,7 +85,7 @@ let MjmlTemplateRenderer = class MjmlTemplateRenderer2 extends import_template_r
   }
 };
 MjmlTemplateRenderer = __decorate([
-  (0, import_container.singleton)(),
-  __param(0, (0, import_container.forwardRef)(() => import_template_renderer_provider.TemplateRendererProvider)),
+  (0, import_decorators.Singleton)(),
+  __param(0, (0, import_decorators.ForwardRef)(() => import_template_renderer_provider.TemplateRendererProvider)),
   __metadata("design:paramtypes", [import_template_renderer_provider.TemplateRendererProvider])
 ], MjmlTemplateRenderer);