@tstdl/base 0.86.0-beta11 → 0.86.0-beta3

package/application/application.d.ts

@@ -5,10 +5,6 @@ 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;
@@ -18,13 +14,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: [RunOptions | OneOrMany<FunctionModuleFunction | Type<Module>>, ...OneOrMany<FunctionModuleFunction | Type<Module>>[]]): void;
+    static run(...functionsAndModules: 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(...optionsFunctionsAndModules: [RunOptions | OneOrMany<FunctionModuleFunction | Type<Module>>, ...OneOrMany<FunctionModuleFunction | Type<Module>>[]]): void;
+    run(...functionsAndModules: OneOrMany<FunctionModuleFunction | Type<Module>>[]): void;
     shutdown(): Promise<void>;
     requestShutdown(): void;
     waitForShutdown(): Promise<void>;

package/application/application.js

@@ -95,10 +95,8 @@ let Application = class Application2 {
     const module2 = new import_function_module.FunctionModule(fn);
     this.registerModule(module2);
   }
-  run(...optionsFunctionsAndModules) {
-    const options = optionsFunctionsAndModules.length > 0 && (0, import_type_guards.isObject)(optionsFunctionsAndModules[0]) ? optionsFunctionsAndModules[0] : void 0;
-    const functionsAndModules = (0, import_type_guards.isUndefined)(options) ? optionsFunctionsAndModules : optionsFunctionsAndModules.slice(1);
-    void this._run(functionsAndModules, options);
+  run(...functionsAndModules) {
+    void this._run(...functionsAndModules);
   }
   async shutdown() {
     this.requestShutdown();
@@ -113,7 +111,7 @@ let Application = class Application2 {
   async waitForShutdown() {
     return this.#shutdownPromise;
   }
-  async _run(functionsAndModules, options = {}) {
+  async _run(...functionsAndModules) {
     for (const fnOrModule of functionsAndModules.flatMap((fns) => fns)) {
       if (fnOrModule.prototype instanceof import_module_base.ModuleBase) {
         this.registerModule(fnOrModule);
@@ -121,9 +119,6 @@ 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, C>): void;
+    static register<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: RegistrationOptions<T, A>): 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, C>, '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>, '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, C>): void;
+    register<T, A = any, C extends Record = Record>(token: InjectionToken<T, A>, providers: OneOrMany<Provider<T, A, C>>, options?: RegistrationOptions<T, A>): 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, C>, '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>, 'lifecycle'>): void;
     /**
      * Check if token has a registered provider
      * @param token token check

package/injector/injector.js

@@ -237,7 +237,7 @@ class Injector {
         return registration.resolutions.get(argumentIdentity);
       }
       const value = this._resolveProvider(resolutionTag, registration, resolveArgument, options, context, injectionContext, chain);
-      const resolution = { tag: resolutionTag, registration, value, argument: injectionContext.argument, chain };
+      const resolution = { tag: resolutionTag, registration, value, argument, chain };
       context.resolutions.push(resolution);
       if (resolutionScoped) {
         context.resolutionScopedResolutions.setFlat(token, argumentIdentity, resolution);
@@ -478,7 +478,7 @@ function throwOnPromise(value, type, chain) {
   }
 }
 function checkOverflow(chain, context) {
-  if (chain.length > 100 || ++context.resolves > 7500) {
+  if (chain.length > 750 || ++context.resolves > 750) {
     throw new import_resolve_error.ResolveError("Resolve stack overflow. This can happen on circular dependencies with transient lifecycles and self reference. Use scoped or singleton lifecycle or forwardRef instead.", chain);
   }
 }

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

@@ -24,6 +24,7 @@ __export(web_server_module_exports, {
 });
 module.exports = __toCommonJS(web_server_module_exports);
 var import_server = require("../../api/server/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");
@@ -86,6 +87,7 @@ let WebServerModule = class WebServerModule2 extends import_module_base.ModuleBa
 };
 WebServerModule = __decorate([
   (0, import_decorators.Singleton)({ defaultArgumentProvider: () => webServerModuleConfiguration }),
+  (0, import_log.Log)(),
   __metadata("design:paramtypes", [])
 ], WebServerModule);
 function configureWebServerModule(config) {

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

@@ -4,5 +4,5 @@ export declare abstract class ObjectStorageProvider<T extends ObjectStorage = Ob
      * get an object storage instance
      * @param module name for object container (module) to store objects in. Can be used to isolate objects like profile pictures and log files
      */
-    abstract get(module: string): T;
+    abstract get(module: string): T | Promise<T>;
 }

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

@@ -17,6 +17,10 @@ export declare class S3ObjectStorageProviderConfig {
      * mutually exclusive with bucket
      */
     bucketPerModule?: boolean;
+    /**
+     * create bucket for requested storage module if it does not exist
+     */
+    autoCreateBucket?: boolean;
     /**
      * s3 access key
      */
@@ -30,8 +34,9 @@ export declare const bucketPerModule: unique symbol;
 export declare class S3ObjectStorageProvider extends ObjectStorageProvider<S3ObjectStorage> {
     private readonly client;
     private readonly bucket;
+    private readonly createBucket;
     constructor(config: S3ObjectStorageProviderConfig);
-    get(module: string): S3ObjectStorage;
+    get(module: string): Promise<S3ObjectStorage>;
 }
 /**
  * configure s3 object storage provider

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

@@ -61,6 +61,10 @@ class S3ObjectStorageProviderConfig {
    * mutually exclusive with bucket
    */
   bucketPerModule;
+  /**
+   * create bucket for requested storage module if it does not exist
+   */
+  autoCreateBucket;
   /**
    * s3 access key
    */
@@ -74,12 +78,14 @@ const bucketPerModule = Symbol("bucket per module");
 let S3ObjectStorageProvider = class S3ObjectStorageProvider2 extends import_object_storage.ObjectStorageProvider {
   client;
   bucket;
+  createBucket;
   constructor(config) {
     super();
     const { hostname, port, protocol } = new URL(config.endpoint);
     if ((0, import_type_guards.isDefined)(config.bucket) && config.bucketPerModule == true) {
       throw new Error("bucket and bucketPerModule is mutually exclusive");
     }
+    this.createBucket = config.autoCreateBucket ?? false;
     this.client = new import_minio.Client({
       endPoint: hostname,
       port: port.length > 0 ? parseInt(port, 10) : void 0,
@@ -89,10 +95,14 @@ let S3ObjectStorageProvider = class S3ObjectStorageProvider2 extends import_obje
     });
     this.bucket = (0, import_type_guards.assertDefinedPass)(config.bucketPerModule == true ? true : config.bucket, "either bucket or bucketPerModule must be specified");
   }
-  get(module2) {
+  async get(module2) {
     const bucket = this.bucket == true ? module2 : (0, import_type_guards.assertStringPass)(this.bucket);
     const prefix = this.bucket == true ? "" : module2 == "" ? "" : `${module2}/`;
-    return new import_s3_object_storage.S3ObjectStorage(this.client, bucket, module2, prefix);
+    const objectStorage = new import_s3_object_storage.S3ObjectStorage(this.client, bucket, module2, prefix);
+    if (this.createBucket) {
+      await objectStorage.ensureBucketExists();
+    }
+    return objectStorage;
   }
 };
 S3ObjectStorageProvider = __decorate([

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

@@ -152,10 +152,7 @@ let S3ObjectStorage = class S3ObjectStorage2 extends import_object_storage.Objec
 S3ObjectStorage = __decorate([
   (0, import_decorators.Singleton)({
     provider: {
-      useFactory: (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)")),
-      async afterResolve(value) {
-        await value.ensureBucketExists();
-      }
+      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)"))
     }
   }),
   __metadata("design:paramtypes", [import_minio.Client, String, String, String])

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.86.0-beta11",
+  "version": "0.86.0-beta3",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -47,7 +47,7 @@
   "peerDependencies": {
     "@elastic/elasticsearch": "^8.9",
     "@koa/router": "^12.0",
-    "@tstdl/angular": "^0.85",
+    "@tstdl/angular": "^0.86-beta1",
     "@zxcvbn-ts/core": "^3.0",
     "@zxcvbn-ts/language-common": "^3.0",
     "@zxcvbn-ts/language-de": "^3.0",

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

@@ -1,3 +1,4 @@
+import type { Entity } from '../../database/index.js';
 import type { ClientOptions } from '@elastic/elasticsearch';
 import type { ElasticSearchIndexConfigArgument } from './config.js';
 import { ElasticSearchIndexConfig } from './config.js';
@@ -6,5 +7,6 @@ export type ElasticsearchModuleConfig = {
     logPrefix: string;
 };
 export declare const elasticsearchModuleConfig: ElasticsearchModuleConfig;
-export declare const ELASTIC_SEARCH_INDEX_CONFIG: import("../../injector/token.js").InjectionToken<ElasticSearchIndexConfig<import("../../database/entity.js").Entity>, ElasticSearchIndexConfigArgument>;
+export declare const ELASTIC_SEARCH_INDEX_CONFIG: import("../../injector/token.js").InjectionToken<ElasticSearchIndexConfig<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,7 +20,8 @@ var module_exports = {};
 __export(module_exports, {
   ELASTIC_SEARCH_INDEX_CONFIG: () => ELASTIC_SEARCH_INDEX_CONFIG,
   configureElasticsearch: () => configureElasticsearch,
-  elasticsearchModuleConfig: () => elasticsearchModuleConfig
+  elasticsearchModuleConfig: () => elasticsearchModuleConfig,
+  getElasticSearchIndexConfig: () => getElasticSearchIndexConfig
 });
 module.exports = __toCommonJS(module_exports);
 var import_core = require("../../core.js");
@@ -59,6 +60,9 @@ 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;