@tstdl/base 0.87.5 → 0.87.7

package/authentication/client/authentication.service.d.ts

@@ -1,14 +1,8 @@
-import type { Observable } from 'rxjs';
-import type { ApiClient } from '../../api/client/index.js';
 import type { AsyncDisposable } from '../../disposable/index.js';
 import { disposeAsync } from '../../disposable/index.js';
 import type { AfterResolve } from '../../injector/index.js';
 import { afterResolve } from '../../injector/index.js';
-import { Lock } from '../../lock/index.js';
-import { Logger } from '../../logger/index.js';
-import { MessageBus } from '../../message-bus/index.js';
 import type { Record } from '../../types.js';
-import type { AuthenticationApiDefinition } from '../authentication.api.js';
 import type { SecretCheckResult, TokenPayload } from '../models/index.js';
 export declare class AuthenticationService<AdditionalTokenPayload extends Record = Record, AuthenticationData = any> implements AfterResolve, AsyncDisposable {
     private readonly client;
@@ -19,27 +13,27 @@ export declare class AuthenticationService<AdditionalTokenPayload extends Record
     private readonly refreshLock;
     private readonly logger;
     private readonly disposeToken;
-    readonly error$: Observable<Error>;
+    readonly error$: import("rxjs").Observable<Error>;
     readonly token: import("../../signals/api.js").WritableSignal<TokenPayload<AdditionalTokenPayload> | undefined>;
     readonly isLoggedIn: import("../../signals/api.js").Signal<boolean>;
     readonly subject: import("../../signals/api.js").Signal<string | undefined>;
     readonly sessionId: import("../../signals/api.js").Signal<string | undefined>;
-    readonly token$: Observable<TokenPayload<AdditionalTokenPayload> | undefined>;
-    readonly definedToken$: Observable<Exclude<TokenPayload<AdditionalTokenPayload>, void | undefined>>;
-    readonly validToken$: Observable<Exclude<TokenPayload<AdditionalTokenPayload>, void | undefined>>;
-    readonly subject$: Observable<string | undefined>;
-    readonly definedSubject$: Observable<string>;
-    readonly sessionId$: Observable<string | undefined>;
-    readonly definedSessionId$: Observable<string>;
-    readonly isLoggedIn$: Observable<boolean>;
-    readonly loggedOut$: Observable<void>;
+    readonly token$: import("rxjs").Observable<TokenPayload<AdditionalTokenPayload> | undefined>;
+    readonly definedToken$: import("rxjs").Observable<Exclude<TokenPayload<AdditionalTokenPayload>, void | undefined>>;
+    readonly validToken$: import("rxjs").Observable<Exclude<TokenPayload<AdditionalTokenPayload>, void | undefined>>;
+    readonly subject$: import("rxjs").Observable<string | undefined>;
+    readonly definedSubject$: import("rxjs").Observable<string>;
+    readonly sessionId$: import("rxjs").Observable<string | undefined>;
+    readonly definedSessionId$: import("rxjs").Observable<string>;
+    readonly isLoggedIn$: import("rxjs").Observable<boolean>;
+    readonly loggedOut$: import("rxjs").Observable<void>;
     private get authenticationData();
     private set authenticationData(value);
     get definedToken(): TokenPayload<AdditionalTokenPayload>;
     get definedSubject(): string;
     get definedSessionId(): string;
     get hasValidToken(): boolean;
-    constructor(client: InstanceType<ApiClient<AuthenticationApiDefinition<TokenPayload<AdditionalTokenPayload>, AuthenticationData>>>, tokenUpdateBus: MessageBus<TokenPayload<AdditionalTokenPayload> | undefined>, loggedOutBus: MessageBus<void>, refreshLock: Lock | undefined, initialAuthenticationData: AuthenticationData | undefined, logger: Logger);
+    constructor(initialAuthenticationData: AuthenticationData | undefined);
     [afterResolve](): void;
     initialize(): void;
     [disposeAsync](): Promise<void>;

package/authentication/client/authentication.service.js

@@ -63,17 +63,16 @@ const authenticationDataStorageKey = "AuthenticationService:authentication-data"
 const tokenUpdateBusName = "AuthenticationService:tokenUpdate";
 const loggedOutBusName = "AuthenticationService:loggedOut";
 const refreshLockResource = "AuthenticationService:refresh";
-const localStorage = globalThis.localStorage;
 let AuthenticationService = class AuthenticationService2 {
-  client;
-  errorSubject;
-  tokenUpdateBus;
-  loggedOutBus;
-  forceRefreshToken;
-  refreshLock;
-  logger;
-  disposeToken;
-  error$;
+  client = (0, import_injector.inject)(import_tokens.AUTHENTICATION_API_CLIENT);
+  errorSubject = new import_rxjs.Subject();
+  tokenUpdateBus = (0, import_injector.inject)(import_message_bus.MessageBus, tokenUpdateBusName);
+  loggedOutBus = (0, import_injector.inject)(import_message_bus.MessageBus, loggedOutBusName);
+  forceRefreshToken = new import_token.CancellationToken();
+  refreshLock = (0, import_injector.inject)(import_lock.Lock, refreshLockResource, { optional: true });
+  logger = (0, import_injector.inject)(import_logger.Logger, "AuthenticationService");
+  disposeToken = new import_token.CancellationToken();
+  error$ = this.errorSubject.asObservable();
   token = (0, import_api.signal)(void 0);
   isLoggedIn = (0, import_api.computed)(() => (0, import_type_guards.isDefined)(this.token()));
   subject = (0, import_api.computed)(() => this.token()?.subject);
@@ -86,21 +85,17 @@ let AuthenticationService = class AuthenticationService2 {
   sessionId$ = (0, import_api.toObservable)(this.sessionId);
   definedSessionId$ = this.sessionId$.pipe((0, import_rxjs.filter)(import_type_guards.isDefined));
   isLoggedIn$ = (0, import_api.toObservable)(this.isLoggedIn);
-  loggedOut$;
+  loggedOut$ = this.loggedOutBus.allMessages$;
   get authenticationData() {
-    try {
-      const data = localStorage?.getItem(authenticationDataStorageKey);
-      return (0, import_type_guards.isNullOrUndefined)(data) ? void 0 : JSON.parse(data);
-    } catch {
-      return void 0;
-    }
+    const data = localStorage.getItem(authenticationDataStorageKey);
+    return (0, import_type_guards.isNullOrUndefined)(data) ? void 0 : JSON.parse(data);
   }
   set authenticationData(data) {
     if ((0, import_type_guards.isUndefined)(data)) {
-      localStorage?.removeItem(authenticationDataStorageKey);
+      localStorage.removeItem(authenticationDataStorageKey);
     } else {
       const json = JSON.stringify(data);
-      localStorage?.setItem(authenticationDataStorageKey, json);
+      localStorage.setItem(authenticationDataStorageKey, json);
     }
   }
   get definedToken() {
@@ -115,20 +110,10 @@ let AuthenticationService = class AuthenticationService2 {
   get hasValidToken() {
     return (this.token()?.exp ?? 0) > (0, import_date_time.currentTimestampSeconds)();
   }
-  constructor(client, tokenUpdateBus, loggedOutBus, refreshLock, initialAuthenticationData, logger) {
-    this.client = client;
-    this.tokenUpdateBus = tokenUpdateBus;
-    this.loggedOutBus = loggedOutBus;
-    this.refreshLock = refreshLock;
-    this.logger = logger;
+  constructor(initialAuthenticationData) {
     if ((0, import_type_guards.isUndefined)(this.authenticationData)) {
       this.authenticationData = initialAuthenticationData;
     }
-    this.disposeToken = new import_token.CancellationToken();
-    this.errorSubject = new import_rxjs.Subject();
-    this.forceRefreshToken = new import_token.CancellationToken();
-    this.error$ = this.errorSubject.asObservable();
-    this.loggedOut$ = loggedOutBus.allMessages$;
   }
   [import_injector.afterResolve]() {
     this.initialize();
@@ -144,6 +129,7 @@ let AuthenticationService = class AuthenticationService2 {
   async dispose() {
     this.disposeToken.set();
     this.errorSubject.complete();
+    await this.loggedOutBus.dispose();
     await this.tokenUpdateBus.dispose();
   }
   setAdditionalData(data) {
@@ -161,7 +147,7 @@ let AuthenticationService = class AuthenticationService2 {
       await Promise.race([
         this.client.endSession(),
         (0, import_timing.timeout)(150)
-      ]).catch((error) => console.error(error));
+      ]).catch((error) => this.logger.error(error));
     } finally {
       this.setNewToken(void 0);
       this.loggedOutBus.publishAndForget();
@@ -195,14 +181,11 @@ let AuthenticationService = class AuthenticationService2 {
     return this.client.checkSecret({ secret });
   }
   saveToken(token) {
-    if ((0, import_type_guards.isUndefined)(globalThis.localStorage)) {
-      return;
-    }
     if ((0, import_type_guards.isNullOrUndefined)(token)) {
-      localStorage?.removeItem(tokenStorageKey);
+      localStorage.removeItem(tokenStorageKey);
     } else {
       const serialized = JSON.stringify(token);
-      localStorage?.setItem(tokenStorageKey, serialized);
+      localStorage.setItem(tokenStorageKey, serialized);
     }
   }
   loadToken() {
@@ -252,20 +235,7 @@ let AuthenticationService = class AuthenticationService2 {
 };
 AuthenticationService = __decorate([
   (0, import_injector.Singleton)(),
-  __param(0, (0, import_injector.Inject)(import_tokens.AUTHENTICATION_API_CLIENT)),
-  __param(1, (0, import_injector.ResolveArg)(tokenUpdateBusName)),
-  __param(2, (0, import_injector.ResolveArg)(loggedOutBusName)),
-  __param(3, (0, import_injector.Inject)(import_lock.Lock, refreshLockResource)),
-  __param(3, (0, import_injector.Optional)()),
-  __param(4, (0, import_injector.Inject)(import_tokens.INITIAL_AUTHENTICATION_DATA)),
-  __param(4, (0, import_injector.Optional)()),
-  __param(5, (0, import_injector.ResolveArg)("AuthenticationService")),
-  __metadata("design:paramtypes", [
-    void 0,
-    import_message_bus.MessageBus,
-    import_message_bus.MessageBus,
-    Object,
-    Object,
-    import_logger.Logger
-  ])
+  __param(0, (0, import_injector.Inject)(import_tokens.INITIAL_AUTHENTICATION_DATA)),
+  __param(0, (0, import_injector.Optional)()),
+  __metadata("design:paramtypes", [Object])
 ], AuthenticationService);

package/authentication/client/http-client.middleware.d.ts

@@ -1,3 +1,4 @@
 import type { HttpClientMiddleware } from '../../http/client/middleware.js';
+import type { ValueOrAsyncProvider } from '../../utils/value-or-provider.js';
 import type { AuthenticationService } from './authentication.service.js';
-export declare function waitForAuthenticationCredentialsMiddleware(authenticationService: AuthenticationService): HttpClientMiddleware;
+export declare function waitForAuthenticationCredentialsMiddleware(authenticationServiceOrProvider: ValueOrAsyncProvider<AuthenticationService>): HttpClientMiddleware;

package/authentication/client/http-client.middleware.js

@@ -22,11 +22,14 @@ __export(http_client_middleware_exports, {
 });
 module.exports = __toCommonJS(http_client_middleware_exports);
 var import_rxjs = require("rxjs");
+var import_value_or_provider = require("../../utils/value-or-provider.js");
 var import_authentication_api = require("../authentication.api.js");
-function waitForAuthenticationCredentialsMiddleware(authenticationService) {
+function waitForAuthenticationCredentialsMiddleware(authenticationServiceOrProvider) {
+  const getAuthenticationService = (0, import_value_or_provider.cacheAsyncValueOrProvider)(authenticationServiceOrProvider);
   async function waitForAuthenticationCredentialsMiddleware2(request, next, context) {
     const endpoint = context?.endpoint;
     if (endpoint?.credentials == true && endpoint.data?.[import_authentication_api.dontWaitForValidToken] != true) {
+      const authenticationService = await getAuthenticationService();
       while (!authenticationService.hasValidToken) {
         await (0, import_rxjs.firstValueFrom)(authenticationService.validToken$);
       }

package/examples/api/authentication.d.ts

@@ -1 +1 @@
-export {};
+import '../../polyfills.js';

package/examples/api/authentication.js

@@ -1,4 +1,5 @@
 "use strict";
+var import_polyfills = require("../../polyfills.js");
 var import_server = require("../../api/server/index.js");
 var import_application = require("../../application/application.js");
 var import_api_client = require("../../authentication/client/api.client.js");
@@ -15,15 +16,6 @@ var import_web_server_module = require("../../module/modules/web-server.module.j
 var import_configure = require("../../signals/implementation/configure.js");
 var import_timing = require("../../utils/timing.js");
 var import_undici = require("undici");
-(0, import_configure.configureDefaultSignalsImplementation)();
-(0, import_server2.configureAuthenticationServer)({
-  serviceOptions: { secret: "djp0fq23576aq" },
-  credentialsRepository: import_mongo_authentication_credentials_repository.MongoAuthenticationCredentialsRepository,
-  sessionRepository: import_mongo_authentication_session_repository.MongoAuthenticationSessionRepository
-});
-(0, import_mongo_authentication_credentials_repository.configureMongoAuthenticationCredentialsRepository)({ collection: "credentials" });
-(0, import_mongo_authentication_session_repository.configureMongoAuthenticationSessionRepository)({ collection: "sessions" });
-(0, import_module3.configureLocalMessageBus)();
 async function serverTest() {
   const authenticationService = await (0, import_inject.injectAsync)(import_server2.AuthenticationService);
   await authenticationService.setCredentials("foobar", "mysuperdupersecret-fvhc54w");
@@ -44,7 +36,16 @@ async function test() {
   ]);
   await import_application.Application.shutdown();
 }
-function main() {
+function bootstrap() {
+  (0, import_configure.configureDefaultSignalsImplementation)();
+  (0, import_server2.configureAuthenticationServer)({
+    serviceOptions: { secret: "djp0fq23576aq" },
+    credentialsRepository: import_mongo_authentication_credentials_repository.MongoAuthenticationCredentialsRepository,
+    sessionRepository: import_mongo_authentication_session_repository.MongoAuthenticationSessionRepository
+  });
+  (0, import_mongo_authentication_credentials_repository.configureMongoAuthenticationCredentialsRepository)({ collection: "credentials" });
+  (0, import_mongo_authentication_session_repository.configureMongoAuthenticationSessionRepository)({ collection: "sessions" });
+  (0, import_module3.configureLocalMessageBus)();
   (0, import_client.configureAuthenticationClient)({
     authenticationApiClient: import_api_client.AuthenticationApiClient
   });
@@ -53,4 +54,4 @@ function main() {
   (0, import_undici_http_client_adapter.configureUndiciHttpClientAdapter)({ dispatcher: new import_undici.Agent({ keepAliveMaxTimeout: 1 }) });
   (0, import_module.configureHttpClient)({ baseUrl: "http://localhost:8000" });
 }
-import_application.Application.run(main, test, import_web_server_module.WebServerModule);
+import_application.Application.run({ bootstrap }, import_web_server_module.WebServerModule, test);

package/examples/api/custom-authentication.d.ts

@@ -1 +1 @@
-export {};
+import '../../polyfills.js';

package/examples/api/custom-authentication.js

@@ -1,4 +1,5 @@
 "use strict";
+var import_polyfills = require("../../polyfills.js");
 var import_server = require("../../api/server/index.js");
 var import_application = require("../../application/application.js");
 var import_client = require("../../authentication/client/index.js");
@@ -17,6 +18,8 @@ var import_module4 = require("../../message-bus/local/module.js");
 var import_modules = require("../../module/modules/index.js");
 var import_schema = require("../../schema/index.js");
 var import_configure = require("../../signals/implementation/configure.js");
+var import_first = require("../../utils/iterable-helpers/first.js");
+var import_skip = require("../../utils/iterable-helpers/skip.js");
 var import_timing = require("../../utils/timing.js");
 var import_undici = require("undici");
 var __decorate = function(decorators, target, key, desc) {
@@ -33,6 +36,28 @@ var __metadata = function(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function")
     return Reflect.metadata(k, v);
 };
+class LocalStoragePolyfill {
+  #storage = /* @__PURE__ */ new Map();
+  get length() {
+    return this.#storage.size;
+  }
+  clear() {
+    throw new Error("Method not implemented.");
+  }
+  getItem(key) {
+    return this.#storage.get(key) ?? null;
+  }
+  key(index) {
+    return (0, import_first.first)((0, import_skip.skip)(this.#storage, index))[0];
+  }
+  removeItem(key) {
+    this.#storage.delete(key);
+  }
+  setItem(key, value) {
+    this.#storage.set(key, value);
+  }
+}
+globalThis.localStorage = new LocalStoragePolyfill();
 class CustomTokenPaylod {
   deviceRegistrationId;
 }
@@ -47,6 +72,7 @@ __decorate([
   (0, import_schema.Property)(),
   __metadata("design:type", String)
 ], AuthenticationData.prototype, "deviceId", void 0);
+const CustomAuthenticationApiClient = (0, import_client.getAuthenticationApiClient)(CustomTokenPaylod, AuthenticationData);
 let CustomTokenPayloadProvider = class CustomTokenPayloadProvider2 extends import_authentication_token_payload_provider.AuthenticationTokenPayloadProvider {
   getTokenPayload(_subject, authenticationData) {
     return { deviceRegistrationId: `registration:${authenticationData.deviceId}` };
@@ -55,37 +81,43 @@ let CustomTokenPayloadProvider = class CustomTokenPayloadProvider2 extends impor
 CustomTokenPayloadProvider = __decorate([
   (0, import_decorators.Singleton)()
 ], CustomTokenPayloadProvider);
-(0, import_module.configureAuthenticationServer)({
-  serviceOptions: { secret: "djp0fq23576aq" },
-  credentialsRepository: import_mongo_authentication_credentials_repository.MongoAuthenticationCredentialsRepository,
-  sessionRepository: import_mongo_authentication_session_repository.MongoAuthenticationSessionRepository,
-  tokenPayloadProvider: CustomTokenPayloadProvider
-});
-(0, import_mongo_authentication_credentials_repository.configureMongoAuthenticationCredentialsRepository)({ collection: "credentials" });
-(0, import_mongo_authentication_session_repository.configureMongoAuthenticationSessionRepository)({ collection: "sessions" });
-const CustomAuthenticationApiClient = (0, import_client.getAuthenticationApiClient)(CustomTokenPaylod, AuthenticationData);
-(0, import_client.configureAuthenticationClient)({
-  authenticationApiClient: CustomAuthenticationApiClient
-});
-(0, import_module4.configureLocalMessageBus)();
 async function serverTest() {
   const authenticationService = await (0, import_inject.injectAsync)(import_authentication_service.AuthenticationService);
-  await authenticationService.setCredentials("foobar", "supersecret");
+  await authenticationService.setCredentials("foobar", "supersecret-dupidupudoo9275");
 }
 async function clientTest() {
   const authenticationService = (0, import_inject.inject)(import_client.AuthenticationService);
-  await (0, import_timing.timeout)(250);
+  await (0, import_timing.timeout)(1500);
   authenticationService.initialize();
-  await authenticationService.login("foobar", "supersecret", { deviceId: "my-device" });
+  await authenticationService.login("foobar", "supersecret-dupidupudoo9275");
   authenticationService.token$.subscribe((token) => console.log({ token }));
   import_application.Application.requestShutdown();
 }
-function main() {
+async function test() {
+  await Promise.all([
+    serverTest(),
+    clientTest()
+  ]);
+  await import_application.Application.shutdown();
+}
+function bootstrap() {
   (0, import_configure.configureDefaultSignalsImplementation)();
+  (0, import_module.configureAuthenticationServer)({
+    serviceOptions: { secret: "djp0fq23576aq" },
+    credentialsRepository: import_mongo_authentication_credentials_repository.MongoAuthenticationCredentialsRepository,
+    sessionRepository: import_mongo_authentication_session_repository.MongoAuthenticationSessionRepository,
+    tokenPayloadProvider: CustomTokenPayloadProvider
+  });
+  (0, import_mongo_authentication_credentials_repository.configureMongoAuthenticationCredentialsRepository)({ collection: "credentials" });
+  (0, import_mongo_authentication_session_repository.configureMongoAuthenticationSessionRepository)({ collection: "sessions" });
+  (0, import_module4.configureLocalMessageBus)();
+  (0, import_client.configureAuthenticationClient)({
+    authenticationApiClient: CustomAuthenticationApiClient,
+    initialAuthenticationData: { deviceId: "my-device" }
+  });
   (0, import_module3.configureNodeHttpServer)();
   (0, import_server.configureApiServer)({ controllers: [import_authentication_api_controller.AuthenticationApiController] });
   (0, import_undici_http_client_adapter.configureUndiciHttpClientAdapter)({ dispatcher: new import_undici.Agent({ keepAliveMaxTimeout: 1 }) });
   (0, import_module2.configureHttpClient)({ baseUrl: "http://localhost:8000" });
-  import_application.Application.run(import_modules.WebServerModule, serverTest, clientTest);
 }
-main();
+import_application.Application.run({ bootstrap }, import_modules.WebServerModule, test);

package/http/client/http-client.d.ts

@@ -2,7 +2,7 @@ import { resolveArgumentType } from '../../injector/index.js';
 import type { Resolvable } from '../../injector/interfaces.js';
 import type { OneOrMany, UndefinableJson } from '../../types.js';
 import type { HttpMethod, HttpValue } from '../types.js';
-import type { HttpClientOptions } from './http-client-options.js';
+import { HttpClientOptions } from './http-client-options.js';
 import type { HttpClientRequestOptions } from './http-client-request.js';
 import { HttpClientRequest } from './http-client-request.js';
 import type { HttpClientResponse } from './http-client-response.js';

package/http/client/http-client.js

@@ -34,6 +34,7 @@ var import_url_builder = require("../../utils/url-builder.js");
 var import_http_headers = require("../http-headers.js");
 var import_http_error = require("../http.error.js");
 var import_types = require("../types.js");
+var import_http_client_options = require("./http-client-options.js");
 var import_http_client_request = require("./http-client-request.js");
 var import_http_client_adapter = require("./http-client.adapter.js");
 var import_tokens = require("./tokens.js");
@@ -53,11 +54,11 @@ var __metadata = function(k, v) {
 };
 let HttpClient = class HttpClient2 {
   adapter = (0, import_injector.inject)(import_http_client_adapter.HttpClientAdapter);
-  middleware = (0, import_injector.inject)(import_tokens.HTTP_CLIENT_MIDDLEWARES);
+  middleware = (0, import_injector.injectAll)(import_tokens.HTTP_CLIENT_MIDDLEWARE, void 0, { optional: true });
   headers = new import_http_headers.HttpHeaders();
   internalMiddleware;
   callHandler;
-  options = (0, import_injector.injectArgument)(this, { optional: true }) ?? {};
+  options = (0, import_injector.injectArgument)(this, { optional: true }) ?? (0, import_injector.inject)(import_http_client_options.HttpClientOptions, void 0, { optional: true }) ?? {};
   constructor() {
     this.internalMiddleware = [
       getBuildRequestUrlMiddleware(this.options.baseUrl),

package/http/client/tokens.d.ts

@@ -1,3 +1,2 @@
 import type { HttpClientMiddleware } from './middleware.js';
 export declare const HTTP_CLIENT_MIDDLEWARE: import("../../injector/token.js").InjectionToken<HttpClientMiddleware, never>;
-export declare const HTTP_CLIENT_MIDDLEWARES: import("../../injector/token.js").InjectionToken<HttpClientMiddleware[], never>;

package/http/client/tokens.js

@@ -18,12 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var tokens_exports = {};
 __export(tokens_exports, {
-  HTTP_CLIENT_MIDDLEWARE: () => HTTP_CLIENT_MIDDLEWARE,
-  HTTP_CLIENT_MIDDLEWARES: () => HTTP_CLIENT_MIDDLEWARES
+  HTTP_CLIENT_MIDDLEWARE: () => HTTP_CLIENT_MIDDLEWARE
 });
 module.exports = __toCommonJS(tokens_exports);
-var import_injector = require("../../injector/injector.js");
 var import_token = require("../../injector/token.js");
 const HTTP_CLIENT_MIDDLEWARE = (0, import_token.injectionToken)("HttpClientMiddleware");
-const HTTP_CLIENT_MIDDLEWARES = (0, import_token.injectionToken)("HttpClientMiddlewares");
-import_injector.Injector.register(HTTP_CLIENT_MIDDLEWARES, { useToken: HTTP_CLIENT_MIDDLEWARE, resolveAll: true });

package/package.json

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

package/utils/value-or-provider.d.ts

@@ -1,3 +1,8 @@
-export type ValueOrProvider<T> = T extends () => any ? never : T | (() => T);
-export type ResolvedValueOrProvider<T extends ValueOrProvider<any>> = T extends ValueOrProvider<infer U> ? U : never;
+export type Provider<T> = () => T;
+export type AsyncProvider<T> = () => (T | Promise<T>);
+export type ValueOrProvider<T> = T extends (() => any) ? never : (T | Provider<T>);
+export type ValueOrAsyncProvider<T> = T extends (() => any) ? never : (T | Provider<T> | AsyncProvider<T>);
+export type ResolvedValueOrProvider<T extends ValueOrAsyncProvider<any>> = T extends ValueOrAsyncProvider<infer U> ? U : never;
 export declare function resolveValueOrProvider<T>(valueOrProvider: ValueOrProvider<T>): T;
+export declare function resolveAsyncValueOrProvider<T>(valueOrProvider: ValueOrAsyncProvider<T>): Promise<T>;
+export declare function cacheAsyncValueOrProvider<T>(provider: ValueOrAsyncProvider<T>): () => (T | Promise<T>);

package/utils/value-or-provider.js

@@ -18,6 +18,8 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var value_or_provider_exports = {};
 __export(value_or_provider_exports, {
+  cacheAsyncValueOrProvider: () => cacheAsyncValueOrProvider,
+  resolveAsyncValueOrProvider: () => resolveAsyncValueOrProvider,
   resolveValueOrProvider: () => resolveValueOrProvider
 });
 module.exports = __toCommonJS(value_or_provider_exports);
@@ -28,3 +30,18 @@ function resolveValueOrProvider(valueOrProvider) {
   }
   return valueOrProvider;
 }
+async function resolveAsyncValueOrProvider(valueOrProvider) {
+  if ((0, import_type_guards.isFunction)(valueOrProvider)) {
+    return valueOrProvider();
+  }
+  return valueOrProvider;
+}
+function cacheAsyncValueOrProvider(provider) {
+  let getValue = async () => {
+    const valuePromise = resolveAsyncValueOrProvider(provider);
+    getValue = async () => valuePromise;
+    void valuePromise.then((resolvedValue) => getValue = () => resolvedValue);
+    return valuePromise;
+  };
+  return () => getValue();
+}