@tstdl/base 0.89.4 → 0.89.6

package/application/application.d.ts

@@ -7,9 +7,10 @@ import type { FunctionModuleFunction } from '../module/modules/function.module.j
 import type { OneOrMany, Type } from '../types.js';
 export type BootstrapFn = () => void | Promise<void>;
 export type RunOptions = {
-    bootstrap?: BootstrapFn;
+    bootstrap?: OneOrMany<BootstrapFn>;
 };
-export declare class Application implements Resolvable<LoggerArgument> {
+export type ApplicationArgument = LoggerArgument;
+export declare class Application implements Resolvable<ApplicationArgument> {
     #private;
     static _instance: Application | undefined;
     private static get instance();

package/application/application.js

@@ -16,6 +16,7 @@ import { ModuleState } from '../module/module.js';
 import { FunctionModule } from '../module/modules/function.module.js';
 import { getShutdownSignal, getShutdownToken } from '../process-shutdown.js';
 import { DeferredPromise } from '../promise/deferred-promise.js';
+import { toArray } from '../utils/array/array.js';
 import { mapAsync } from '../utils/async-iterable-helpers/map.js';
 import { toArrayAsync } from '../utils/async-iterable-helpers/to-array.js';
 import { isDefined, isFunction, isObject, isUndefined } from '../utils/type-guards.js';
@@ -68,6 +69,9 @@ let Application = class Application {
         this.registerModule(module);
     }
     run(...optionsFunctionsAndModules) {
+        if (this.#shutdownToken.isSet) {
+            throw new Error('Application was shut down.');
+        }
         const options = ((optionsFunctionsAndModules.length > 0) && isObject(optionsFunctionsAndModules[0])) ? optionsFunctionsAndModules[0] : undefined;
         const functionsAndModules = (isUndefined(options) ? optionsFunctionsAndModules : optionsFunctionsAndModules.slice(1));
         void this._run(functionsAndModules, options);
@@ -95,7 +99,9 @@ let Application = class Application {
             }
         }
         if (isDefined(options.bootstrap)) {
-            await runInInjectionContext(this.#injector, options.bootstrap);
+            for (const fn of toArray(options.bootstrap)) {
+                await runInInjectionContext(this.#injector, fn);
+            }
         }
         const modules = await toArrayAsync(mapAsync(this.#moduleTypesAndInstances, async (instanceOrType) => (isFunction(instanceOrType) ? this.#injector.resolveAsync(instanceOrType) : instanceOrType)));
         try {

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

@@ -13,6 +13,6 @@ export function configureMongoKeyValueStore(keyValueRepositoryConfig, register =
     Injector.register(DEFAULT_KEY_VALUE_REPOSITORY_CONFIG, { useValue: keyValueRepositoryConfig });
     if (register) {
         Injector.registerSingleton(KeyValueStoreProvider, { useToken: MongoKeyValueStoreProvider });
-        Injector.registerSingleton(KeyValueStore, { useToken: MongoKeyValueStore, defaultArgument: '' });
+        Injector.registerSingleton(KeyValueStore, { useToken: MongoKeyValueStore });
     }
 }

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

@@ -7,15 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
 import { getNewId } from '../../database/index.js';
-import { InjectArg, Singleton } from '../../injector/index.js';
-import { KeyValueStore } from '../../key-value-store/index.js';
+import { Singleton } from '../../injector/index.js';
+import { KeyValueStore, MongoKeyValueStoreProvider } from '../../key-value-store/index.js';
 import { currentTimestamp } from '../../utils/date-time.js';
 import { objectEntries } from '../../utils/object/object.js';
-import { assertStringPass, isUndefined } from '../../utils/type-guards.js';
+import { assertString, isUndefined } from '../../utils/type-guards.js';
 import { MongoKeyValueRepository } from './mongo-key-value.repository.js';
 let MongoKeyValueStore = class MongoKeyValueStore extends KeyValueStore {
     keyValueRepository;
@@ -61,8 +58,15 @@ let MongoKeyValueStore = class MongoKeyValueStore extends KeyValueStore {
     }
 };
 MongoKeyValueStore = __decorate([
-    Singleton(),
-    __param(1, InjectArg((argument) => assertStringPass(argument, 'key-value store argument missing (module)'))),
+    Singleton({
+        provider: {
+            useFactory: (argument, context) => {
+                const provider = context.resolve(MongoKeyValueStoreProvider);
+                assertString(argument, 'Missing or invalid argument (KV-Store module)');
+                return provider.get(argument);
+            }
+        }
+    }),
     __metadata("design:paramtypes", [MongoKeyValueRepository, String])
 ], MongoKeyValueStore);
 export { MongoKeyValueStore };

package/lock/mongo/provider.js

@@ -10,7 +10,7 @@ import { inject, injectArgument } from '../../injector/inject.js';
 import { Injector } from '../../injector/injector.js';
 import { LockProvider } from '../../lock/index.js';
 import { Logger } from '../../logger/index.js';
-import { assertDefinedPass } from '../../utils/type-guards.js';
+import { assertDefinedPass, isDefined } from '../../utils/type-guards.js';
 import { MongoLock } from './lock.js';
 import { mongoLockModuleConfig } from './module.js';
 import { MongoLockRepository } from './mongo-lock-repository.js';
@@ -18,7 +18,7 @@ let MongoLockProvider = MongoLockProvider_1 = class MongoLockProvider extends Lo
     #injector = inject(Injector);
     #lockRepository = inject(MongoLockRepository, assertDefinedPass(mongoLockModuleConfig.lockEntityRepositoryConfig, 'mongo lock module not configured'));
     #logger = inject(Logger, 'MongoLock');
-    #prefix = injectArgument(this);
+    #prefix = injectArgument(this, { optional: true });
     prefix(prefix) {
         return this.#injector.resolve(MongoLockProvider_1, this.getResourceString(prefix));
     }
@@ -26,7 +26,7 @@ let MongoLockProvider = MongoLockProvider_1 = class MongoLockProvider extends Lo
         return new MongoLock(this.#lockRepository, this.getResourceString(resource), this.#logger);
     }
     getResourceString(resource) {
-        const prefixDivider = (this.#prefix.length > 0) ? ':' : '';
+        const prefixDivider = (isDefined(this.#prefix) && (this.#prefix.length > 0)) ? ':' : '';
         return `${this.#prefix}${prefixDivider}${resource}`;
     }
 };

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

@@ -55,7 +55,9 @@ let WebServerModule = class WebServerModule extends ModuleBase {
     }
 };
 WebServerModule = __decorate([
-    Singleton({ defaultArgumentProvider: () => webServerModuleConfiguration }),
+    Singleton({
+        defaultArgumentProvider: () => webServerModuleConfiguration
+    }),
     __metadata("design:paramtypes", [])
 ], WebServerModule);
 export { WebServerModule };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.89.4",
+  "version": "0.89.6",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -130,7 +130,7 @@
     "typescript": "5.2"
   },
   "peerDependencies": {
-    "@elastic/elasticsearch": "^8.9",
+    "@elastic/elasticsearch": "^8.10",
     "@koa/router": "^12.0",
     "@tstdl/angular": "^0.89",
     "@zxcvbn-ts/core": "^3.0",
@@ -146,7 +146,7 @@
     "mongodb": "^6.1",
     "nodemailer": "^6.9",
     "playwright": "^1.38",
-    "preact": "^10.17",
+    "preact": "^10.18",
     "preact-render-to-string": "^6.2",
     "undici": "^5.25",
     "urlpattern-polyfill": "^9.0"