@tstdl/base 0.83.8 → 0.83.10

package/.eslintrc.cjs

@@ -68,7 +68,7 @@ module.exports = {
     'import/no-duplicates': ['warn', { 'prefer-inline': true }],
     'import/no-cycle': ['off', { ignoreExternal: true }],
     'import/no-self-import': ['error'],
-    'import/no-extraneous-dependencies': ['error', { devDependencies: false, includeTypes: true }],
+    'import/no-extraneous-dependencies': ['off', { devDependencies: false, includeTypes: true }],
     'import/no-empty-named-blocks': ['error'],
     'import/no-mutable-exports': ['error'],
     'import/no-nodejs-modules': ['error'],
@@ -211,70 +211,59 @@ module.exports = {
 
         'field',
 
-        // Getters
+        // Getters / Setters
         '#private-static-get',
-        'private-static-get',
-        'protected-static-get',
-        'public-static-get',
-
-        /*
-        'private-decorated-get',
-        'protected-decorated-get',
-        'public-decorated-get',
-        */
-
-        '#private-instance-get',
-        'private-instance-get',
-        'protected-instance-get',
-        'public-instance-get',
-
-        'protected-abstract-get',
-        'public-abstract-get',
-
-        '#private-get',
-        'private-get',
-        'protected-get',
-        'public-get',
-
-        'static-get',
-        'instance-get',
-        'abstract-get',
-
-        // 'decorated-get',
-
-        'get',
-
-        // Setters
         '#private-static-set',
+        'private-static-get',
         'private-static-set',
+        'protected-static-get',
         'protected-static-set',
+        'public-static-get',
         'public-static-set',
 
         /*
+        'private-decorated-get',
         'private-decorated-set',
+        'protected-decorated-get',
         'protected-decorated-set',
+        'public-decorated-get',
         'public-decorated-set',
         */
 
+        '#private-instance-get',
         '#private-instance-set',
+        'private-instance-get',
         'private-instance-set',
+        'protected-instance-get',
         'protected-instance-set',
+        'public-instance-get',
         'public-instance-set',
 
+        'protected-abstract-get',
         'protected-abstract-set',
+        'public-abstract-get',
         'public-abstract-set',
 
+        '#private-get',
         '#private-set',
+        'private-get',
         'private-set',
+        'protected-get',
         'protected-set',
+        'public-get',
         'public-set',
 
+        'static-get',
         'static-set',
+        'instance-get',
         'instance-set',
+        'abstract-get',
         'abstract-set',
 
-        // 'decorated-set',
+        'decorated-get',
+        'decorated-set',
 
+        'get',
         'set',
 
         // Static initialization

package/authentication/authentication.api.d.ts

@@ -1,32 +1,26 @@
 import type { ApiDefinition } from '../api/types.js';
 import type { SchemaTestable } from '../schema/schema.js';
-import type { ObjectSchemaOrType } from '../schema/types/types.js';
+import type { ObjectSchema, ObjectSchemaOrType } from '../schema/types/types.js';
 import type { Record } from '../types.js';
+import type { TokenPayload } from './index.js';
 import { SecretCheckResult } from './models/secret-check-result.model.js';
 import { TokenPayloadBase } from './models/token-payload-base.model.js';
 export declare const dontWaitForValidToken: unique symbol;
-type GetAuthenticationApiEndpointsDefinition<AdditionalTokenPayload = Record<never>, AuthenticationData = void> = typeof getAuthenticationApiEndpointsDefinition<AdditionalTokenPayload, AuthenticationData>;
-type AuthenticationApiEndpointsDefinition<AdditionalTokenPayload = Record<never>, AuthenticationData = void> = ReturnType<GetAuthenticationApiEndpointsDefinition<AdditionalTokenPayload, AuthenticationData>>;
-export type AuthenticationApiDefinition<AdditionalTokenPayload = Record<never>, AuthenticationData = void> = ApiDefinition<string, AuthenticationApiEndpointsDefinition<AdditionalTokenPayload, AuthenticationData>>;
+type GetAuthenticationApiEndpointsDefinition<AdditionalTokenPayload extends Record = Record<never>, AuthenticationData = void> = typeof getAuthenticationApiEndpointsDefinition<AdditionalTokenPayload, AuthenticationData>;
+type AuthenticationApiEndpointsDefinition<AdditionalTokenPayload extends Record = Record<never>, AuthenticationData = void> = ReturnType<GetAuthenticationApiEndpointsDefinition<AdditionalTokenPayload, AuthenticationData>>;
+export type AuthenticationApiDefinition<AdditionalTokenPayload extends Record = Record<never>, AuthenticationData = void> = ApiDefinition<string, AuthenticationApiEndpointsDefinition<AdditionalTokenPayload, AuthenticationData>>;
 export declare const authenticationApiDefinition: {
     resource: string;
     endpoints: {
         token: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 subject: string;
                 secret: string;
                 data: unknown;
             }>;
-            result: import("../schema/types/types.js").ObjectSchema<{
-                jti: string;
-                iat: number;
-                exp: number;
-                refreshTokenExp: number;
-                sessionId: string;
-                subject: string;
-            }>;
+            result: ObjectSchema<TokenPayloadBase>;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -35,17 +29,10 @@ export declare const authenticationApiDefinition: {
         refresh: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 data: unknown;
             }>;
-            result: import("../schema/types/types.js").ObjectSchema<{
-                jti: string;
-                iat: number;
-                exp: number;
-                refreshTokenExp: number;
-                sessionId: string;
-                subject: string;
-            }>;
+            result: ObjectSchema<TokenPayloadBase>;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -63,7 +50,7 @@ export declare const authenticationApiDefinition: {
         initResetSecret: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 subject: string;
             }>;
             result: import("../schema/types/types.js").ValueSchema<"ok">;
@@ -71,7 +58,7 @@ export declare const authenticationApiDefinition: {
         resetSecret: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 token: string;
                 newSecret: string;
             }>;
@@ -80,7 +67,7 @@ export declare const authenticationApiDefinition: {
         checkSecret: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 secret: string;
             }>;
             result: typeof SecretCheckResult;
@@ -91,18 +78,18 @@ export declare const authenticationApiDefinition: {
         };
     };
 };
-export declare function getAuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData, AdditionalEndpoints>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>, resource?: string, additionalEndpoints?: AdditionalEndpoints): {
+export declare function getAuthenticationApiDefinition<AdditionalTokenPayload extends Record, AuthenticationData, AdditionalEndpoints>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>, resource?: string, additionalEndpoints?: AdditionalEndpoints): {
     resource: string;
     endpoints: {
         token: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 subject: string;
                 secret: string;
                 data: AuthenticationData;
             }>;
-            result: import("../schema/types/types.js").ObjectSchema<import("type-fest").Simplify<import("type-fest/source/merge.js").Merge_<TokenPayloadBase, AdditionalTokenPayload>, {}>>;
+            result: ObjectSchema<TokenPayload<AdditionalTokenPayload>>;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -111,10 +98,10 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload, A
         refresh: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 data: AuthenticationData;
             }>;
-            result: import("../schema/types/types.js").ObjectSchema<import("type-fest").Simplify<import("type-fest/source/merge.js").Merge_<TokenPayloadBase, AdditionalTokenPayload>, {}>>;
+            result: ObjectSchema<TokenPayload<AdditionalTokenPayload>>;
             credentials: true;
             data: {
                 [dontWaitForValidToken]: boolean;
@@ -132,7 +119,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload, A
         initResetSecret: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 subject: string;
             }>;
             result: import("../schema/types/types.js").ValueSchema<"ok">;
@@ -140,7 +127,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload, A
         resetSecret: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 token: string;
                 newSecret: string;
             }>;
@@ -149,7 +136,7 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload, A
         checkSecret: {
             resource: string;
             method: "POST";
-            parameters: import("../schema/types/types.js").ObjectSchema<{
+            parameters: ObjectSchema<{
                 secret: string;
             }>;
             result: typeof SecretCheckResult;
@@ -160,16 +147,16 @@ export declare function getAuthenticationApiDefinition<AdditionalTokenPayload, A
         };
     };
 };
-export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenPayload, AuthenticationData>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>): {
+export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenPayload extends Record, AuthenticationData>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>): {
     token: {
         resource: string;
         method: "POST";
-        parameters: import("../schema/types/types.js").ObjectSchema<{
+        parameters: ObjectSchema<{
             subject: string;
             secret: string;
             data: AuthenticationData;
         }>;
-        result: import("../schema/types/types.js").ObjectSchema<import("type-fest").Simplify<import("type-fest/source/merge.js").Merge_<TokenPayloadBase, AdditionalTokenPayload>, {}>>;
+        result: ObjectSchema<TokenPayload<AdditionalTokenPayload>>;
         credentials: true;
         data: {
             [dontWaitForValidToken]: boolean;
@@ -178,10 +165,10 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
     refresh: {
         resource: string;
         method: "POST";
-        parameters: import("../schema/types/types.js").ObjectSchema<{
+        parameters: ObjectSchema<{
             data: AuthenticationData;
         }>;
-        result: import("../schema/types/types.js").ObjectSchema<import("type-fest").Simplify<import("type-fest/source/merge.js").Merge_<TokenPayloadBase, AdditionalTokenPayload>, {}>>;
+        result: ObjectSchema<TokenPayload<AdditionalTokenPayload>>;
         credentials: true;
         data: {
             [dontWaitForValidToken]: boolean;
@@ -199,7 +186,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
     initResetSecret: {
         resource: string;
         method: "POST";
-        parameters: import("../schema/types/types.js").ObjectSchema<{
+        parameters: ObjectSchema<{
             subject: string;
         }>;
         result: import("../schema/types/types.js").ValueSchema<"ok">;
@@ -207,7 +194,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
     resetSecret: {
         resource: string;
         method: "POST";
-        parameters: import("../schema/types/types.js").ObjectSchema<{
+        parameters: ObjectSchema<{
             token: string;
             newSecret: string;
         }>;
@@ -216,7 +203,7 @@ export declare function getAuthenticationApiEndpointsDefinition<AdditionalTokenP
     checkSecret: {
         resource: string;
         method: "POST";
-        parameters: import("../schema/types/types.js").ObjectSchema<{
+        parameters: ObjectSchema<{
             secret: string;
         }>;
         result: typeof SecretCheckResult;

package/authentication/client/api.client.d.ts

@@ -1,8 +1,9 @@
 import type { ApiClient } from '../../api/client/index.js';
 import type { SchemaTestable } from '../../schema/schema.js';
 import type { ObjectSchemaOrType } from '../../schema/types/types.js';
+import type { Record } from '../../types.js';
 import type { AuthenticationApiDefinition } from '../authentication.api.js';
-export declare function getAuthenticationApiClient<AdditionalTokenPayload, AuthenticationData>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>): ApiClient<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData>>;
+export declare function getAuthenticationApiClient<AdditionalTokenPayload extends Record, AuthenticationData>(additionalTokenPayloadSchema: ObjectSchemaOrType<AdditionalTokenPayload>, authenticationDataSchema: SchemaTestable<AuthenticationData>): ApiClient<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData>>;
 declare const defaultAuthenticationApiClient: ApiClient<AuthenticationApiDefinition<{}, unknown>>;
 export declare class AuthenticationApiClient extends defaultAuthenticationApiClient {
 }

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

@@ -10,7 +10,7 @@ import type { Record } from '../../types.js';
 import type { Observable } from 'rxjs';
 import type { AuthenticationApiDefinition } from '../authentication.api.js';
 import type { SecretCheckResult, TokenPayload } from '../models/index.js';
-export declare class AuthenticationService<AdditionalTokenPayload = Record<never>, AuthenticationData = void> implements AfterResolve, AsyncDisposable {
+export declare class AuthenticationService<AdditionalTokenPayload extends Record = Record<never>, AuthenticationData = void> implements AfterResolve, AsyncDisposable {
     private readonly client;
     private readonly errorSubject;
     private readonly tokenSubject;
@@ -20,8 +20,6 @@ export declare class AuthenticationService<AdditionalTokenPayload = Record<never
     private readonly refreshLock;
     private readonly logger;
     private readonly disposeToken;
-    private set authenticationData(value);
-    private get authenticationData();
     readonly error$: Observable<Error>;
     readonly token$: Observable<TokenPayload<AdditionalTokenPayload> | undefined>;
     readonly definedToken$: Observable<TokenPayload<AdditionalTokenPayload>>;
@@ -32,6 +30,8 @@ export declare class AuthenticationService<AdditionalTokenPayload = Record<never
     readonly definedSessionId$: Observable<string>;
     readonly isLoggedIn$: Observable<boolean>;
     readonly loggedOut$: Observable<void>;
+    private get authenticationData();
+    private set authenticationData(value);
     get isLoggedIn(): boolean;
     get token(): TokenPayload<AdditionalTokenPayload> | undefined;
     get definedToken(): TokenPayload<AdditionalTokenPayload>;

package/authentication/client/authentication.service.js

@@ -69,22 +69,6 @@ let AuthenticationService = class AuthenticationService2 {
   refreshLock;
   logger;
   disposeToken;
-  set authenticationData(data) {
-    if ((0, import_type_guards.isUndefined)(data)) {
-      localStorage.removeItem(authenticationDataStorageKey);
-    } else {
-      const json = JSON.stringify(data);
-      localStorage.setItem(authenticationDataStorageKey, json);
-    }
-  }
-  get authenticationData() {
-    try {
-      const data = localStorage.getItem(authenticationDataStorageKey);
-      return (0, import_type_guards.isNull)(data) ? void 0 : JSON.parse(data);
-    } catch {
-      return void 0;
-    }
-  }
   error$;
   token$;
   definedToken$;
@@ -95,6 +79,22 @@ let AuthenticationService = class AuthenticationService2 {
   definedSessionId$;
   isLoggedIn$;
   loggedOut$;
+  get authenticationData() {
+    try {
+      const data = localStorage.getItem(authenticationDataStorageKey);
+      return (0, import_type_guards.isNull)(data) ? void 0 : JSON.parse(data);
+    } catch {
+      return void 0;
+    }
+  }
+  set authenticationData(data) {
+    if ((0, import_type_guards.isUndefined)(data)) {
+      localStorage.removeItem(authenticationDataStorageKey);
+    } else {
+      const json = JSON.stringify(data);
+      localStorage.setItem(authenticationDataStorageKey, json);
+    }
+  }
   get isLoggedIn() {
     return (0, import_type_guards.isDefined)(this.tokenSubject.value);
   }

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

@@ -1,5 +1,5 @@
 import type { HttpClientMiddleware } from '../../http/client/http-client.js';
 import { AuthenticationService } from './authentication.service.js';
 export type AuthenticationServiceProvider = () => (AuthenticationService<any, any> | Promise<AuthenticationService<any, any>>);
-export declare const defaultAuthenticationServiceProvider: () => Promise<AuthenticationService<unknown, unknown>>;
+export declare const defaultAuthenticationServiceProvider: () => Promise<AuthenticationService<import("../../types.js").Record, unknown>>;
 export declare function waitForAuthenticationCredentialsMiddleware(authenticationService?: AuthenticationService | AuthenticationServiceProvider): HttpClientMiddleware;

package/authentication/models/token.model.d.ts

@@ -1,11 +1,11 @@
 import type { Record } from '../../types.js';
 import type { JwtToken, JwtTokenHeader } from '../../utils/jwt.js';
-import type { TokenPayloadBase } from '../models/token-payload-base.model.js';
+import type { TokenPayloadBase } from './token-payload-base.model.js';
 export type TokenHeader = {
     v: number;
 };
-export type Token<AdditionalTokenPayload = Record<never>> = JwtToken<TokenPayload<AdditionalTokenPayload>, JwtTokenHeader<TokenHeader>>;
-export type TokenPayload<T = Record<never>> = T & TokenPayloadBase;
+export type Token<AdditionalTokenPayload extends Record = Record<never>> = JwtToken<TokenPayload<AdditionalTokenPayload>, JwtTokenHeader<TokenHeader>>;
+export type TokenPayload<T extends Record = Record<never>> = T & TokenPayloadBase;
 export type RefreshToken = JwtToken<{
     /** expiration timestamp in seconds */
     exp: number;

package/authentication/server/authentication.api-controller.d.ts

@@ -2,7 +2,7 @@ import type { ApiController, ApiRequestContext, ApiServerResult } from '../../ap
 import type { Record } from '../../types.js';
 import type { AuthenticationApiDefinition } from '../authentication.api.js';
 import { AuthenticationService } from './authentication.service.js';
-export declare class AuthenticationApiController<AdditionalTokenPayload = Record<never>, AuthenticationData = void> implements ApiController<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData>> {
+export declare class AuthenticationApiController<AdditionalTokenPayload extends Record = Record<never>, AuthenticationData = void> implements ApiController<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData>> {
     readonly authenticationService: AuthenticationService<AdditionalTokenPayload, AuthenticationData>;
     constructor(authenticationService: AuthenticationService<AdditionalTokenPayload, AuthenticationData>);
     token({ parameters }: ApiRequestContext<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData>, 'token'>): Promise<ApiServerResult<AuthenticationApiDefinition<AdditionalTokenPayload, AuthenticationData>, 'token'>>;

package/authentication/server/authentication.service.d.ts

@@ -34,12 +34,12 @@ export type AuthenticationResult = {
     success: false;
     subject?: undefined;
 };
-export type TokenResult<AdditionalTokenPayload = Record<never>> = {
+export type TokenResult<AdditionalTokenPayload extends Record = Record<never>> = {
     token: string;
     jsonToken: Token<AdditionalTokenPayload>;
     refreshToken: string;
 };
-export declare class AuthenticationService<AdditionalTokenPayload = Record<never>, AuthenticationData = void> implements AfterResolve {
+export declare class AuthenticationService<AdditionalTokenPayload extends Record = Record<never>, AuthenticationData = void> implements AfterResolve {
     private readonly credentialsRepository;
     private readonly sessionRepository;
     private readonly authenticationSecretRequirementsValidator;

package/authentication/server/helper.d.ts

@@ -1,6 +1,6 @@
 import type { HttpServerRequest } from '../../http/server/index.js';
 import type { Record } from '../../types.js';
-import type { SecretResetToken, RefreshToken, Token } from '../models/index.js';
+import type { RefreshToken, SecretResetToken, Token } from '../models/index.js';
 /**
  *
  * @param request
@@ -8,8 +8,8 @@ import type { SecretResetToken, RefreshToken, Token } from '../models/index.js';
  * @returns token string
  */
 export declare function tryGetAuthorizationTokenStringFromRequest(request: HttpServerRequest, cookieName?: string, forceCookie?: boolean): string | undefined;
-export declare function tryGetTokenFromRequest<AdditionalTokenPayload = Record<never>>(request: HttpServerRequest, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload> | undefined>;
-export declare function getTokenFromRequest<AdditionalTokenPayload = Record<never>>(request: HttpServerRequest, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload>>;
-export declare function getTokenFromString<AdditionalTokenPayload = Record<never>>(tokenString: string, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload>>;
+export declare function tryGetTokenFromRequest<AdditionalTokenPayload extends Record = Record<never>>(request: HttpServerRequest, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload> | undefined>;
+export declare function getTokenFromRequest<AdditionalTokenPayload extends Record = Record<never>>(request: HttpServerRequest, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload>>;
+export declare function getTokenFromString<AdditionalTokenPayload extends Record = Record<never>>(tokenString: string, tokenVersion: number, secret: string | BinaryData): Promise<Token<AdditionalTokenPayload>>;
 export declare function getRefreshTokenFromString(tokenString: string, secret: string | BinaryData): Promise<RefreshToken>;
 export declare function getSecretResetTokenFromString(tokenString: string, secret: string | BinaryData): Promise<SecretResetToken>;

package/container/decorators.d.ts

@@ -1,6 +1,6 @@
 import type { Decorator } from '../reflection/index.js';
-import type { Constructor, OneOrMany, Simplify, TypedExtract, TypedOmit } from '../types.js';
-import type { Lifecycle, RegistrationOptions } from './container.js';
+import type { Constructor, OneOrMany, Simplify, TypedOmit } from '../types.js';
+import type { RegistrationOptions } from './container.js';
 import type { Provider } from './provider.js';
 import type { InjectionToken } from './token.js';
 import type { ArgumentProvider, ForwardRefInjectionToken, Mapper } from './types.js';
@@ -32,7 +32,7 @@ export declare function singleton<T = any, A = any>(options?: InjectableOptionsW
  * registers the class in the global container with scoped lifecycle. Decorated class is not modified in any way
  * @param options registration options
  */
-export declare function scoped<T = any, A = any>(lifecycle: Simplify<TypedExtract<Lifecycle, 'resolution'>>, options?: InjectableOptionsWithoutLifecycle<T, A>): ClassDecorator;
+export declare function scoped<T = any, A = any>(lifecycle: 'resolution', options?: InjectableOptionsWithoutLifecycle<T, A>): ClassDecorator;
 /**
  * sets the token used to resolve the parameter
  * @param token token used for resolving

package/data-structures/multi-key-map.d.ts

@@ -2,8 +2,7 @@ import { Dictionary } from './dictionary.js';
 type Node = {
     nodeKey: any;
     parentNode: Node | undefined;
-    hasInnerMap: boolean;
-    children: Map<any, Node>;
+    children: Map<any, Node> | undefined;
     hasValue: boolean;
     value: any;
 };

package/data-structures/multi-key-map.js

@@ -21,7 +21,6 @@ __export(multi_key_map_exports, {
   MultiKeyMap: () => MultiKeyMap
 });
 module.exports = __toCommonJS(multi_key_map_exports);
-var import_lazy_property = require("../utils/object/lazy-property.js");
 var import_type_guards = require("../utils/type-guards.js");
 var import_circular_buffer = require("./circular-buffer.js");
 var import_dictionary = require("./dictionary.js");
@@ -32,7 +31,7 @@ class MultiKeyMap extends import_dictionary.Dictionary {
   constructor(newMapProvider = () => /* @__PURE__ */ new Map()) {
     super();
     this.newMapProvider = newMapProvider;
-    this.rootNode = createNode(void 0, void 0, this.newMapProvider);
+    this.rootNode = createNode(void 0, void 0);
   }
   includes([key, value]) {
     if (!this.has(key)) {
@@ -54,10 +53,9 @@ class MultiKeyMap extends import_dictionary.Dictionary {
   }
   set(key, value) {
     const node = this.getNode(key, true);
-    const hasValue = node.hasValue;
-    node.hasValue = true;
     node.value = value;
-    if (!hasValue) {
+    if (!node.hasValue) {
+      node.hasValue = true;
       this.incrementSize();
     }
   }
@@ -65,14 +63,14 @@ class MultiKeyMap extends import_dictionary.Dictionary {
     return this.has(key);
   }
   has(key) {
-    const node = this.getNode(key, false);
+    const node = this.getNode(key);
     return (0, import_type_guards.isDefined)(node) && node.hasValue;
   }
   getFlat(...key) {
     return this.get(key);
   }
   get(key) {
-    const node = this.getNode(key, false);
+    const node = this.getNode(key);
     if ((0, import_type_guards.isUndefined)(node)) {
       return void 0;
     }
@@ -82,7 +80,7 @@ class MultiKeyMap extends import_dictionary.Dictionary {
     return this.delete(key);
   }
   delete(key) {
-    const node = this.getNode(key, false);
+    const node = this.getNode(key);
     if ((0, import_type_guards.isUndefined)(node)) {
       return false;
     }
@@ -118,7 +116,7 @@ class MultiKeyMap extends import_dictionary.Dictionary {
       if (node.hasValue) {
         yield [key, node.value];
       }
-      if (node.hasInnerMap) {
+      if ((0, import_type_guards.isDefined)(node.children)) {
         for (const innerNode of node.children.values()) {
           queue.add([[...key, innerNode.nodeKey], innerNode]);
         }
@@ -126,48 +124,44 @@ class MultiKeyMap extends import_dictionary.Dictionary {
     }
   }
   _clear() {
-    this.rootNode = createNode(void 0, void 0, this.newMapProvider);
-  }
-  getNode(key, create) {
-    let node = getOrCreateChildNode(this.rootNode, key[0], this.newMapProvider);
-    for (let i = 1; i < key.length; i++) {
-      if (!node.hasInnerMap && !create) {
-        return void 0;
+    this.rootNode = createNode(void 0, void 0);
+    this.setSize(0);
+  }
+  getNode(key, create = false) {
+    let node = this.rootNode;
+    for (const nodeKey of key) {
+      if ((0, import_type_guards.isUndefined)(node.children)) {
+        if (!create) {
+          return void 0;
+        }
+        node.children = this.newMapProvider();
+      }
+      let childNode = node.children.get(nodeKey);
+      if ((0, import_type_guards.isUndefined)(childNode)) {
+        if (!create) {
+          return void 0;
+        }
+        childNode = createNode(nodeKey, node);
+        node.children.set(nodeKey, childNode);
       }
-      node = getOrCreateChildNode(this.rootNode, key[i], this.newMapProvider);
+      node = childNode;
     }
     return node;
   }
   deleteNodeIfEmpty(node) {
-    if (node.hasValue || node.hasInnerMap && node.children.size > 0 || (0, import_type_guards.isUndefined)(node.parentNode)) {
+    if (node.hasValue || (0, import_type_guards.isDefined)(node.children) && node.children.size > 0 || (0, import_type_guards.isUndefined)(node.parentNode)) {
       return;
     }
     node.parentNode.children.delete(node.nodeKey);
     this.deleteNodeIfEmpty(node.parentNode);
   }
 }
-function getOrCreateChildNode(node, key, newMapProvider) {
-  const childNode = node.children.get(key);
-  if ((0, import_type_guards.isDefined)(childNode)) {
-    return childNode;
-  }
-  const newNode = createNode(key, node, newMapProvider);
-  node.children.set(key, newNode);
-  return newNode;
-}
-function createNode(nodeKey, parentNode, newMapProvider) {
-  return (0, import_lazy_property.lazyObject)({
-    nodeKey: { value: nodeKey },
-    parentNode: { value: parentNode },
-    hasInnerMap: false,
-    children() {
-      return getChildren(this, newMapProvider);
-    },
+function createNode(nodeKey, parentNode) {
+  return {
+    nodeKey,
+    parentNode,
+    children: void 0,
     hasValue: false,
-    value: { value: void 0 }
-  });
-}
-function getChildren(node, newMapProvider) {
-  node.hasInnerMap = true;
-  return newMapProvider();
+    value: void 0
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tstdl/base",
-  "version": "0.83.8",
+  "version": "0.83.10",
   "author": "Patrick Hein",
   "publishConfig": {
     "access": "public"
@@ -21,7 +21,7 @@
     "luxon": "^3.3",
     "reflect-metadata": "^0.1",
     "rxjs": "^7.8",
-    "type-fest": "^2.19"
+    "type-fest": "^3.7"
   },
   "devDependencies": {
     "@types/chroma-js": "2.4",
@@ -59,7 +59,7 @@
     "nodemailer": "^6.9",
     "preact": "^10.13",
     "preact-render-to-string": "^5.2",
-    "puppeteer": "^19.7",
+    "puppeteer": "^19.8",
     "undici": "^5.21",
     "urlpattern-polyfill": "^6.0"
   },

package/text/localization.service.d.ts

@@ -47,7 +47,7 @@ export declare function localizationData<T>(data: LocalizationData<T>): Localiza
  * @param localization
  * @returns
  */
-export declare function getLocalizationKeys<T extends Localization<any, any>>(_localization?: T): ProxyLocalizationKeys<T['keys']>;
+export declare function getLocalizationKeys<T extends Localization>(_localization?: T): ProxyLocalizationKeys<T['keys']>;
 export declare const autoEnumerationLocalization: typeof _autoEnumerationLocalization;
 export declare class LocalizationService {
     private readonly logger;

package/types.d.ts

@@ -1,4 +1,4 @@
-import type { UnionToIntersection } from 'type-fest';
+import type { Except, UnionToIntersection } from 'type-fest';
 export type ObjectLiteral = {};
 export type PrimitiveTypeMap = {
     'string': string;
@@ -113,16 +113,19 @@ export type OmitBy<T, V> = Omit<T, {
  */
 export type Optionalize<T extends object> = OmitBy<T, undefined> & Partial<PickBy<T, undefined>>;
 export type SimplifiedOptionalize<T extends object> = Simplify<Optionalize<T>>;
-/**
- * remove nested type information
- */
-export type Simplify<T> = T extends (Primitive | Function | Date | RegExp) ? T : T extends (infer AT)[] ? Simplify<AT>[] : T extends readonly (infer AT)[] ? readonly Simplify<AT>[] : T extends Record ? SimplifyObject<T> : T;
-/**
- * remove type information on object
- */
+export type Merge<T1, T2> = SimplifyObject<Except<T1, Extract<keyof T1, keyof T2>> & T2>;
+export type Simplify<T> = T extends BuiltIn ? T : T extends readonly any[] ? SimplifyArray<T> : T extends Record ? SimplifyObject<T> : T;
 export type SimplifyObject<T extends Record> = {
     [K in keyof T]: T[K];
 } & {};
+export type SimplifyArray<T extends readonly any[]> = {
+    [I in keyof T]: Simplify<T[I]>;
+};
+export type SimplifyDeep<T> = T extends BuiltIn ? T : T extends readonly any[] ? {
+    [K in keyof T]: SimplifyDeep<T[K]>;
+} : T extends Record ? {
+    [K in keyof T]: SimplifyDeep<T[K]>;
+} & {} : T;
 export type UnionToTuple<T, Tuple extends any[] = []> = UnionToIntersection<T extends any ? () => T : never> extends () => infer R ? UnionToTuple<Exclude<T, R>, [R, ...Tuple]> : Tuple;
 export type UndefinableObject<T extends Record> = {
     [K in keyof T]: T[K] | undefined;