@tstdl/base 0.86.0-beta5 → 0.86.0-beta7

package/application/application.d.ts

@@ -5,6 +5,10 @@ import type { Module } from '../module/module.js';
 import type { FunctionModuleFunction } from '../module/modules/function.module.js';
 import type { OneOrMany, Type } from '../types.js';
 import type { ReadonlyCancellationToken } from '../utils/cancellation-token.js';
+export type BootstrapFn = () => void | Promise<void>;
+export type RunOptions = {
+    bootstrap?: BootstrapFn;
+};
 export declare class Application implements Resolvable<LoggerArgument> {
     #private;
     static _instance: Application | undefined;
@@ -14,13 +18,13 @@ export declare class Application implements Resolvable<LoggerArgument> {
     static get shutdownToken(): ReadonlyCancellationToken;
     static registerModule(moduleType: Type<Module>): void;
     static registerModuleFunction(fn: FunctionModuleFunction): void;
-    static run(...functionsAndModules: OneOrMany<FunctionModuleFunction | Type<Module>>[]): void;
+    static run(...functionsAndModules: [RunOptions | OneOrMany<FunctionModuleFunction | Type<Module>>, ...OneOrMany<FunctionModuleFunction | Type<Module>>[]]): void;
     static waitForShutdown(): Promise<void>;
     static shutdown(): Promise<void>;
     static requestShutdown(): void;
     registerModule(moduleType: Module | Type<Module>): void;
     registerModuleFunction(fn: FunctionModuleFunction): void;
-    run(...functionsAndModules: OneOrMany<FunctionModuleFunction | Type<Module>>[]): void;
+    run(...optionsFunctionsAndModules: [RunOptions | OneOrMany<FunctionModuleFunction | Type<Module>>, ...OneOrMany<FunctionModuleFunction | Type<Module>>[]]): void;
     shutdown(): Promise<void>;
     requestShutdown(): void;
     waitForShutdown(): Promise<void>;

package/application/application.js

@@ -95,8 +95,10 @@ let Application = class Application2 {
     const module2 = new import_function_module.FunctionModule(fn);
     this.registerModule(module2);
   }
-  run(...functionsAndModules) {
-    void this._run(...functionsAndModules);
+  run(...optionsFunctionsAndModules) {
+    const options = optionsFunctionsAndModules.length > 0 && (0, import_type_guards.isNotFunction)(optionsFunctionsAndModules[0]) ? optionsFunctionsAndModules[0] : void 0;
+    const functionsAndModules = (0, import_type_guards.isUndefined)(options) ? optionsFunctionsAndModules : optionsFunctionsAndModules.slice(1);
+    void this._run(functionsAndModules, options);
   }
   async shutdown() {
     this.requestShutdown();
@@ -111,7 +113,7 @@ let Application = class Application2 {
   async waitForShutdown() {
     return this.#shutdownPromise;
   }
-  async _run(...functionsAndModules) {
+  async _run(functionsAndModules, options = {}) {
     for (const fnOrModule of functionsAndModules.flatMap((fns) => fns)) {
       if (fnOrModule.prototype instanceof import_module_base.ModuleBase) {
         this.registerModule(fnOrModule);
@@ -119,6 +121,9 @@ let Application = class Application2 {
         this.registerModuleFunction(fnOrModule);
       }
     }
+    if ((0, import_type_guards.isDefined)(options.bootstrap)) {
+      await (0, import_inject.runInInjectionContext)(this.#injector, options.bootstrap);
+    }
     const modules = await (0, import_to_array.toArrayAsync)((0, import_map.mapAsync)(this.#moduleTypesAndInstances, async (instanceOrType) => (0, import_type_guards.isFunction)(instanceOrType) ? this.#injector.resolveAsync(instanceOrType) : instanceOrType));
     try {
       await Promise.race([

package/injector/injector.d.ts

@@ -27,14 +27,14 @@ export declare class Injector implements AsyncDisposable {
      * @param provider provider used to resolve the token
      * @param options registration options
      */
-    static register<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: RegistrationOptions<T, A>): void;
+    static register<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: RegistrationOptions<T, A, C>): void;
     /**
      * Globally register a provider for a token as a singleton. Alias for {@link register} with `singleton` lifecycle
      * @param token token to register
      * @param provider provider used to resolve the token
      * @param options registration options
      */
-    static registerSingleton<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: TypedOmit<RegistrationOptions<T, A>, 'lifecycle'>): void;
+    static registerSingleton<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: TypedOmit<RegistrationOptions<T, A, C>, 'lifecycle'>): void;
     dispose(): Promise<void>;
     [disposeAsync](): Promise<void>;
     fork(name: string): Injector;
@@ -44,14 +44,14 @@ export declare class Injector implements AsyncDisposable {
      * @param provider provider used to resolve the token
      * @param options registration options
      */
-    register<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: RegistrationOptions<T, A>): void;
+    register<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: RegistrationOptions<T, A, C>): void;
     /**
      * Register a provider for a token as a singleton. Alias for {@link register} with `singleton` lifecycle
      * @param token token to register
      * @param provider provider used to resolve the token
      * @param options registration options
      */
-    registerSingleton<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: TypedOmit<RegistrationOptions<T, A>, 'lifecycle'>): void;
+    registerSingleton<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: TypedOmit<RegistrationOptions<T, A, C>, 'lifecycle'>): void;
     /**
      * Check if token has a registered provider
      * @param token token check

package/package.json

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

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("../../injector/token.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,8 +20,7 @@ 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_core = require("../../core.js");
@@ -60,9 +59,6 @@ import_injector.Injector.registerSingleton(import_elasticsearch.Client, {
 import_injector.Injector.registerSingleton(ELASTIC_SEARCH_INDEX_CONFIG, {
   useFactory: (argument, context) => context.resolve(import_config.ElasticSearchIndexConfig, argument)
 });
-function getElasticSearchIndexConfig(indexName) {
-  return (0, import_inject.inject)(import_config.ElasticSearchIndexConfig, indexName);
-}
 function getUrl(node) {
   if ((0, import_type_guards.isString)(node)) {
     return node;